KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mac80211: fix compile errors when LED support in the kernel is disabled

Browse source 
SVN-Revision: 24411
This commit is contained in:
Felix Fietkau 2010-12-10 12:00:09 +00:00
parent 7da7badd3e
commit d770298657
2 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
package/mac80211/patches/510-ath9k_led_cleanup.patch
View file

@ -286,13 +286,15 @@
static void ath9k_deinit_softc(struct ath_softc *sc);
/*
@@ -750,6 +764,10 @@ int ath9k_init_device(u16 devid, struct
@@ -750,6 +764,12 @@ int ath9k_init_device(u16 devid, struct
ath9k_init_txpower_limits(sc);
+#ifdef CONFIG_MAC80211_LEDS
+ /* must be initialized before ieee80211_register_hw */
+ sc->led_cdev.default_trigger = ieee80211_create_tpt_led_trigger(sc->hw,
+ ath9k_tpt_blink, ARRAY_SIZE(ath9k_tpt_blink));
+#endif
+
/* Register with mac80211 */
error = ieee80211_register_hw(hw);

18
package/mac80211/patches/511-mac80211_no_led_fix.patch Normal file
View file

@ -0,0 +1,18 @@
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -642,6 +642,7 @@ enum queue_stop_reason {
IEEE80211_QUEUE_STOP_REASON_SKB_ADD,
};
+#ifdef CONFIG_MAC80211_LEDS
struct tpt_led_trigger {
struct led_trigger trig;
char name[32];
@@ -652,6 +653,7 @@ struct tpt_led_trigger {
unsigned long prev_traffic;
unsigned long tx_bytes, rx_bytes;
};
+#endif
/**
* mac80211 scan flags - currently active scan mode