backport mac80211 and iw from trunk
[openwrt-10.03/.git] / package / mac80211 / patches / 008-led_default.patch
1 --- a/config.mk
2 +++ b/config.mk
3 @@ -132,7 +132,7 @@ CONFIG_COMPAT_MAC80211_RC_DEFAULT=minstr
4  CONFIG_MAC80211_RC_PID=y
5  CONFIG_MAC80211_RC_MINSTREL=y
6  CONFIG_MAC80211_RC_MINSTREL_HT=y
7 -CONFIG_MAC80211_LEDS=y
8 +# CONFIG_MAC80211_LEDS=y
9  
10  # enable mesh networking too
11  CONFIG_MAC80211_MESH=y
12 @@ -242,7 +242,7 @@ CONFIG_B43_PCI_AUTOSELECT=y
13  ifdef CONFIG_PCMCIA
14  CONFIG_B43_PCMCIA=y
15  endif #CONFIG_PCMCIA
16 -CONFIG_B43_LEDS=y
17 +# CONFIG_B43_LEDS=y
18  CONFIG_B43_PHY_LP=y
19  CONFIG_B43_NPHY=y
20  # CONFIG_B43_FORCE_PIO=y
21 @@ -251,7 +251,7 @@ CONFIG_B43_NPHY=y
22  CONFIG_B43LEGACY=m
23  CONFIG_B43LEGACY_HWRNG=y
24  CONFIG_B43LEGACY_PCI_AUTOSELECT=y
25 -CONFIG_B43LEGACY_LEDS=y
26 +# CONFIG_B43LEGACY_LEDS=y
27  # CONFIG_B43LEGACY_DEBUG=y
28  CONFIG_B43LEGACY_DMA=y
29  CONFIG_B43LEGACY_PIO=y
30 @@ -561,7 +561,7 @@ endif
31  
32  # p54
33  CONFIG_P54_COMMON=m
34 -CONFIG_P54_LEDS=y
35 +# CONFIG_P54_LEDS=y
36  
37  # Atheros
38  CONFIG_ATH_COMMON=m
39 --- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
40 +++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
41 @@ -864,6 +864,7 @@ static void ath9k_led_brightness_work(st
42         }
43  }
44  
45 +#ifdef CONFIG_LEDS_CLASS
46  static void ath9k_led_brightness(struct led_classdev *led_cdev,
47                                  enum led_brightness brightness)
48  {
49 @@ -875,6 +876,7 @@ static void ath9k_led_brightness(struct 
50                 ieee80211_queue_delayed_work(priv->hw,
51                                              &led->brightness_work, 0);
52  }
53 +#endif
54  
55  static void ath9k_led_stop_brightness(struct ath9k_htc_priv *priv)
56  {
57 @@ -887,6 +889,7 @@ static void ath9k_led_stop_brightness(st
58  static int ath9k_register_led(struct ath9k_htc_priv *priv, struct ath_led *led,
59                               char *trigger)
60  {
61 +#ifdef CONFIG_LEDS_CLASS
62         int ret;
63  
64         led->priv = priv;
65 @@ -904,14 +907,19 @@ static int ath9k_register_led(struct ath
66         INIT_DELAYED_WORK(&led->brightness_work, ath9k_led_brightness_work);
67  
68         return ret;
69 +#else
70 +       return 0;
71 +#endif
72  }
73  
74  static void ath9k_unregister_led(struct ath_led *led)
75  {
76 +#ifdef CONFIG_LEDS_CLASS
77         if (led->registered) {
78                 led_classdev_unregister(&led->led_cdev);
79                 led->registered = 0;
80         }
81 +#endif
82  }
83  
84  void ath9k_deinit_leds(struct ath9k_htc_priv *priv)