hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
openwrt/package/mac80211/patches/008-led_default.patch

85 lines
2.0 KiB
Diff
Raw Normal View History

mac80211: replace 800-nuke_led_code.patch with something smaller. most of the #ifdef spaghetti that the old patch introduced was completely unnecessary SVN-Revision: 22866
2010-08-31 23:34:27 +00:00
--- a/config.mk
+++ b/config.mk
mac80211: upgrade to wireless-testing 2010-09-14, replace the external carl9170 with the recently merged upstream version SVN-Revision: 23061
2010-09-14 22:53:54 +00:00
@@ -132,7 +132,7 @@ CONFIG_COMPAT_MAC80211_RC_DEFAULT=minstr
CONFIG_MAC80211_RC_PID=y
mac80211: replace 800-nuke_led_code.patch with something smaller. most of the #ifdef spaghetti that the old patch introduced was completely unnecessary SVN-Revision: 22866
2010-08-31 23:34:27 +00:00
CONFIG_MAC80211_RC_MINSTREL=y
CONFIG_MAC80211_RC_MINSTREL_HT=y
-CONFIG_MAC80211_LEDS=y
+# CONFIG_MAC80211_LEDS=y
# enable mesh networking too
CONFIG_MAC80211_MESH=y
mac80211: update to wireless-testing 2010-09-28 SVN-Revision: 23149
2010-09-29 13:13:16 +00:00
@@ -240,7 +240,7 @@ CONFIG_B43_PCI_AUTOSELECT=y
mac80211: upgrade to wireless-testing 2010-09-14, replace the external carl9170 with the recently merged upstream version SVN-Revision: 23061
2010-09-14 22:53:54 +00:00
ifdef CONFIG_PCMCIA
CONFIG_B43_PCMCIA=y
endif #CONFIG_PCMCIA
mac80211: replace 800-nuke_led_code.patch with something smaller. most of the #ifdef spaghetti that the old patch introduced was completely unnecessary SVN-Revision: 22866
2010-08-31 23:34:27 +00:00
-CONFIG_B43_LEDS=y
+# CONFIG_B43_LEDS=y
CONFIG_B43_PHY_LP=y
mac80211: upgrade to wireless-testing 2010-09-14, replace the external carl9170 with the recently merged upstream version SVN-Revision: 23061
2010-09-14 22:53:54 +00:00
CONFIG_B43_NPHY=y
mac80211: replace 800-nuke_led_code.patch with something smaller. most of the #ifdef spaghetti that the old patch introduced was completely unnecessary SVN-Revision: 22866
2010-08-31 23:34:27 +00:00
# CONFIG_B43_FORCE_PIO=y
mac80211: update to wireless-testing 2010-09-28 SVN-Revision: 23149
2010-09-29 13:13:16 +00:00
@@ -249,7 +249,7 @@ CONFIG_B43_NPHY=y
mac80211: replace 800-nuke_led_code.patch with something smaller. most of the #ifdef spaghetti that the old patch introduced was completely unnecessary SVN-Revision: 22866
2010-08-31 23:34:27 +00:00
CONFIG_B43LEGACY=m
CONFIG_B43LEGACY_HWRNG=y
CONFIG_B43LEGACY_PCI_AUTOSELECT=y
-CONFIG_B43LEGACY_LEDS=y
+# CONFIG_B43LEGACY_LEDS=y
# CONFIG_B43LEGACY_DEBUG=y
CONFIG_B43LEGACY_DMA=y
CONFIG_B43LEGACY_PIO=y
mac80211: update to wireless-testing 2010-11-30 SVN-Revision: 24235
2010-12-04 01:32:04 +00:00
@@ -559,7 +559,7 @@ endif
mac80211: replace 800-nuke_led_code.patch with something smaller. most of the #ifdef spaghetti that the old patch introduced was completely unnecessary SVN-Revision: 22866
2010-08-31 23:34:27 +00:00
# p54
CONFIG_P54_COMMON=m
-CONFIG_P54_LEDS=y
+# CONFIG_P54_LEDS=y
# Atheros
CONFIG_ATH_COMMON=m
--- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
mac80211: update to wireless-testing 2010-11-30 SVN-Revision: 24235
2010-12-04 01:32:04 +00:00
@@ -863,6 +863,7 @@ static void ath9k_led_brightness_work(st
mac80211: replace 800-nuke_led_code.patch with something smaller. most of the #ifdef spaghetti that the old patch introduced was completely unnecessary SVN-Revision: 22866
2010-08-31 23:34:27 +00:00
}
}
+#ifdef CONFIG_LEDS_CLASS
static void ath9k_led_brightness(struct led_classdev *led_cdev,
enum led_brightness brightness)
{
mac80211: update to wireless-testing 2010-11-30 SVN-Revision: 24235
2010-12-04 01:32:04 +00:00
@@ -874,6 +875,7 @@ static void ath9k_led_brightness(struct
mac80211: replace 800-nuke_led_code.patch with something smaller. most of the #ifdef spaghetti that the old patch introduced was completely unnecessary SVN-Revision: 22866
2010-08-31 23:34:27 +00:00
ieee80211_queue_delayed_work(priv->hw,
&led->brightness_work, 0);
}
+#endif
static void ath9k_led_stop_brightness(struct ath9k_htc_priv *priv)
{
mac80211: update to wireless-testing 2010-11-30 SVN-Revision: 24235
2010-12-04 01:32:04 +00:00
@@ -886,6 +888,7 @@ static void ath9k_led_stop_brightness(st
mac80211: replace 800-nuke_led_code.patch with something smaller. most of the #ifdef spaghetti that the old patch introduced was completely unnecessary SVN-Revision: 22866
2010-08-31 23:34:27 +00:00
static int ath9k_register_led(struct ath9k_htc_priv *priv, struct ath_led *led,
char *trigger)
{
+#ifdef CONFIG_LEDS_CLASS
int ret;
led->priv = priv;
mac80211: update to wireless-testing 2010-11-30 SVN-Revision: 24235
2010-12-04 01:32:04 +00:00
@@ -903,14 +906,19 @@ static int ath9k_register_led(struct ath
mac80211: replace 800-nuke_led_code.patch with something smaller. most of the #ifdef spaghetti that the old patch introduced was completely unnecessary SVN-Revision: 22866
2010-08-31 23:34:27 +00:00
INIT_DELAYED_WORK(&led->brightness_work, ath9k_led_brightness_work);
return ret;
+#else
+ return 0;
+#endif
}
static void ath9k_unregister_led(struct ath_led *led)
{
+#ifdef CONFIG_LEDS_CLASS
if (led->registered) {
led_classdev_unregister(&led->led_cdev);
led->registered = 0;
}
+#endif
}
void ath9k_deinit_leds(struct ath9k_htc_priv *priv)