aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-12-10 12:00:09 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-12-10 12:00:09 +0000
commit0071fb7d4ad7b7b44270ac9dced95c573f682e4d (patch)
treeb1f872b412d1bdd8306179d8d92b0d306c838659
parent9ea24821946bf3dd2113ed802d4101a7ec8e980b (diff)
downloadupstream-0071fb7d4ad7b7b44270ac9dced95c573f682e4d.tar.gz
upstream-0071fb7d4ad7b7b44270ac9dced95c573f682e4d.tar.bz2
upstream-0071fb7d4ad7b7b44270ac9dced95c573f682e4d.zip
mac80211: fix compile errors when LED support in the kernel is disabled
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24411 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/mac80211/patches/510-ath9k_led_cleanup.patch4
-rw-r--r--package/mac80211/patches/511-mac80211_no_led_fix.patch18
2 files changed, 21 insertions, 1 deletions
diff --git a/package/mac80211/patches/510-ath9k_led_cleanup.patch b/package/mac80211/patches/510-ath9k_led_cleanup.patch
index 968804ad3a..84d7b0613b 100644
--- a/package/mac80211/patches/510-ath9k_led_cleanup.patch
+++ b/package/mac80211/patches/510-ath9k_led_cleanup.patch
@@ -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);
diff --git a/package/mac80211/patches/511-mac80211_no_led_fix.patch b/package/mac80211/patches/511-mac80211_no_led_fix.patch
new file mode 100644
index 0000000000..237d6012e6
--- /dev/null
+++ b/package/mac80211/patches/511-mac80211_no_led_fix.patch
@@ -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