aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211
diff options
context:
space:
mode:
authorAlexandros C. Couloumbis <alex@ozo.com>2010-12-23 14:58:16 +0000
committerAlexandros C. Couloumbis <alex@ozo.com>2010-12-23 14:58:16 +0000
commit7576b6b36b1c6ff5ad53c94c1803f0345828d245 (patch)
treeb327dca71887129fac07fda58b2e5537dd399d61 /package/mac80211
parent605dc51087a3408d538bfac9f7659d974ea74cdf (diff)
downloadupstream-7576b6b36b1c6ff5ad53c94c1803f0345828d245.tar.gz
upstream-7576b6b36b1c6ff5ad53c94c1803f0345828d245.tar.bz2
upstream-7576b6b36b1c6ff5ad53c94c1803f0345828d245.zip
package/mac80211: fix issue when CONFIG_MAC80211_LEDS is not set.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24813 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211')
-rw-r--r--package/mac80211/patches/303-tpt_led_trigger_declaration_fix.patch35
1 files changed, 35 insertions, 0 deletions
diff --git a/package/mac80211/patches/303-tpt_led_trigger_declaration_fix.patch b/package/mac80211/patches/303-tpt_led_trigger_declaration_fix.patch
new file mode 100644
index 0000000000..938617682e
--- /dev/null
+++ b/package/mac80211/patches/303-tpt_led_trigger_declaration_fix.patch
@@ -0,0 +1,35 @@
+From: Luciano Coelho <luciano.coelho@xxxxxxxxx>
+
+If CONFIG_MAC80211_LEDS is not set, ieee80211_i.h was failing to compile,
+because struct led_trigger is only declared when CONFIG_LEDS_TRIGGERS is
+set.
+
+This patch adds ifdefs around the tpt_led_trigger declaration in
+ieee80211_i.h to avoid the problem.
+
+Cc: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
+Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
+---
+ net/mac80211/ieee80211_i.h | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
+index 0817ec6..7541d42 100644
+--- a/net/mac80211/ieee80211_i.h
++++ b/net/mac80211/ieee80211_i.h
+@@ -631,6 +631,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];
+@@ -642,6 +643,7 @@ struct tpt_led_trigger {
+ unsigned int active, want;
+ bool running;
+ };
++#endif
+
+ /**
+ * mac80211 scan flags - currently active scan mode