mac80211: merge changes from trunk and add back the !LINUX_2_4 dependency
[openwrt-10.03/.git] / package / mac80211 / patches / 303-tpt_led_trigger_declaration_fix.patch
1 From: Luciano Coelho <luciano.coelho@xxxxxxxxx>
2
3 If CONFIG_MAC80211_LEDS is not set, ieee80211_i.h was failing to compile,
4 because struct led_trigger is only declared when CONFIG_LEDS_TRIGGERS is
5 set.
6
7 This patch adds ifdefs around the tpt_led_trigger declaration in
8 ieee80211_i.h to avoid the problem.
9
10 Cc: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
11 Signed-off-by: Luciano Coelho <luciano.coelho@xxxxxxxxx>
12 ---
13  net/mac80211/ieee80211_i.h |    2 ++
14  1 files changed, 2 insertions(+), 0 deletions(-)
15
16 diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
17 index 0817ec6..7541d42 100644
18 --- a/net/mac80211/ieee80211_i.h
19 +++ b/net/mac80211/ieee80211_i.h
20 @@ -631,6 +631,7 @@ enum queue_stop_reason {
21         IEEE80211_QUEUE_STOP_REASON_SKB_ADD,
22  };
23  
24 +#ifdef CONFIG_MAC80211_LEDS
25  struct tpt_led_trigger {
26         struct led_trigger trig;
27         char name[32];
28 @@ -642,6 +643,7 @@ struct tpt_led_trigger {
29         unsigned int active, want;
30         bool running;
31  };
32 +#endif
33  
34  /**
35   * mac80211 scan flags - currently active scan mode