package/mac80211/patches/800-nuke_led_code.patch |
1 | | +++ b/config.mk |
| 1 | --- |
| 2 | config.mk | 14 +++++++------- |
| 3 | drivers/net/wireless/ath/ath9k/ath9k.h | 4 ++++ |
| 4 | drivers/net/wireless/ath/ath9k/gpio.c | 2 ++ |
| 5 | drivers/net/wireless/ath/ath9k/init.c | 6 ++++++ |
| 6 | drivers/net/wireless/ath/ath9k/main.c | 6 ++++++ |
| 7 | drivers/net/wireless/ath/ath9k/pci.c | 4 ++++ |
| 8 | include/linux/compat-2.6.25.h | 2 ++ |
| 9 | net/mac80211/iface.c | 4 ++++ |
| 10 | net/mac80211/main.c | 8 ++++++++ |
| 11 | net/mac80211/mlme.c | 6 ++++++ |
| 12 | net/mac80211/pm.c | 2 ++ |
| 13 | net/mac80211/rx.c | 4 ++++ |
| 14 | net/mac80211/status.c | 4 ++++ |
| 15 | net/mac80211/tx.c | 4 ++++ |
| 16 | net/mac80211/util.c | 6 ++++++ |
| 17 | 15 files changed, 69 insertions(+), 7 deletions(-) |
| 18 | |
| 19 | --- compat-wireless-2010-07-29.orig/config.mk |
2 | 20 | @@ -115,7 +115,7 @@ CONFIG_COMPAT_MAC80211_RC_DEFAULT=minstr |
3 | 21 | # CONFIG_MAC80211_RC_PID=y |
4 | 22 | CONFIG_MAC80211_RC_MINSTREL=y |
... | ... | |
61 | 79 | |
62 | 80 | # Atheros |
63 | 81 | CONFIG_ATH_COMMON=m |
64 | | +++ b/include/linux/compat-2.6.25.h |
| 82 | --- compat-wireless-2010-07-29.orig/include/linux/compat-2.6.25.h |
65 | 83 | @@ -146,10 +146,12 @@ static inline void __hwrng_unregister(st |
66 | 84 | hwrng_unregister(rng); |
67 | 85 | } |
... | ... | |
76 | 94 | |
77 | 95 | /** |
78 | 96 | * The following things are out of ./include/linux/kernel.h |
79 | | +++ b/drivers/net/wireless/ath/ath9k/gpio.c |
| 97 | --- compat-wireless-2010-07-29.orig/drivers/net/wireless/ath/ath9k/gpio.c |
80 | 98 | @@ -20,6 +20,7 @@ |
81 | 99 | /* LED functions */ |
82 | 100 | /********************************/ |
... | ... | |
94 | 112 | |
95 | 113 | /*******************/ |
96 | 114 | /* Rfkill */ |
97 | | +++ b/drivers/net/wireless/ath/ath9k/pci.c |
| 115 | --- compat-wireless-2010-07-29.orig/drivers/net/wireless/ath/ath9k/pci.c |
98 | 116 | @@ -273,7 +273,9 @@ static int ath_pci_suspend(struct pci_de |
99 | 117 | struct ath_wiphy *aphy = hw->priv; |
100 | 118 | struct ath_softc *sc = aphy->sc; |
... | ... | |
119 | 137 | |
120 | 138 | return 0; |
121 | 139 | } |
122 | | +++ b/drivers/net/wireless/ath/ath9k/ath9k.h |
| 140 | --- compat-wireless-2010-07-29.orig/drivers/net/wireless/ath/ath9k/ath9k.h |
123 | 141 | @@ -465,6 +465,7 @@ void ath9k_btcoex_timer_pause(struct ath |
124 | 142 | /********************/ |
125 | 143 | /* LED Control */ |
... | ... | |
152 | 170 | +#endif |
153 | 171 | |
154 | 172 | int beacon_interval; |
155 | | |
156 | | +++ b/drivers/net/wireless/ath/ath9k/init.c |
| 173 | |
| 174 | --- compat-wireless-2010-07-29.orig/drivers/net/wireless/ath/ath9k/init.c |
157 | 175 | @@ -34,9 +34,11 @@ int modparam_nohwcrypt; |
158 | 176 | module_param_named(nohwcrypt, modparam_nohwcrypt, int, 0444); |
159 | 177 | MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption"); |
... | ... | |
187 | 205 | |
188 | 206 | for (i = 0; i < sc->num_sec_wiphy; i++) { |
189 | 207 | struct ath_wiphy *aphy = sc->sec_wiphy[i]; |
190 | | +++ b/drivers/net/wireless/ath/ath9k/main.c |
| 208 | --- compat-wireless-2010-07-29.orig/drivers/net/wireless/ath/ath9k/main.c |
191 | 209 | @@ -868,9 +868,11 @@ void ath_radio_enable(struct ath_softc * |
192 | 210 | ath9k_hw_set_interrupts(ah, ah->imask); |
193 | 211 | |
... | ... | |
225 | 243 | |
226 | 244 | cancel_delayed_work_sync(&sc->tx_complete_work); |
227 | 245 | cancel_work_sync(&sc->paprd_work); |
228 | | +++ b/net/mac80211/iface.c |
| 246 | --- compat-wireless-2010-07-29.orig/net/mac80211/iface.c |
229 | 247 | @@ -21,7 +21,9 @@ |
230 | 248 | #include "sta_info.h" |
231 | 249 | #include "debugfs_netdev.h" |
... | ... | |
247 | 265 | } |
248 | 266 | |
249 | 267 | /* |
250 | | +++ b/net/mac80211/main.c |
| 268 | --- compat-wireless-2010-07-29.orig/net/mac80211/main.c |
251 | 269 | @@ -29,7 +29,9 @@ |
252 | 270 | #include "rate.h" |
253 | 271 | #include "mesh.h" |
... | ... | |
289 | 307 | kfree(local->int_scan_req); |
290 | 308 | } |
291 | 309 | EXPORT_SYMBOL(ieee80211_unregister_hw); |
292 | | +++ b/net/mac80211/mlme.c |
| 310 | --- compat-wireless-2010-07-29.orig/net/mac80211/mlme.c |
293 | 311 | @@ -26,7 +26,9 @@ |
294 | 312 | #include "ieee80211_i.h" |
295 | 313 | #include "driver-ops.h" |
... | ... | |
321 | 339 | changed |= BSS_CHANGED_ASSOC; |
322 | 340 | sdata->vif.bss_conf.assoc = false; |
323 | 341 | |
324 | | +++ b/net/mac80211/pm.c |
| 342 | --- compat-wireless-2010-07-29.orig/net/mac80211/pm.c |
325 | 343 | @@ -4,7 +4,9 @@ |
326 | 344 | #include "ieee80211_i.h" |
327 | 345 | #include "mesh.h" |
... | ... | |
333 | 351 | |
334 | 352 | int __ieee80211_suspend(struct ieee80211_hw *hw) |
335 | 353 | { |
336 | | +++ b/net/mac80211/rx.c |
| 354 | --- compat-wireless-2010-07-29.orig/net/mac80211/rx.c |
337 | 355 | @@ -21,7 +21,9 @@ |
338 | 356 | |
339 | 357 | #include "ieee80211_i.h" |
... | ... | |
345 | 363 | #include "mesh.h" |
346 | 364 | #include "wep.h" |
347 | 365 | #include "wpa.h" |
348 | | @@ -1343,7 +1345,9 @@ ieee80211_rx_h_defragment(struct ieee802 |
| 366 | @@ -1342,8 +1344,10 @@ ieee80211_rx_h_defragment(struct ieee802 |
| 367 | rx->sta->rx_packets++; |
349 | 368 | if (is_multicast_ether_addr(hdr->addr1)) |
350 | 369 | rx->local->dot11MulticastReceivedFrameCount++; |
351 | | else |
352 | 370 | +#ifdef CONFIG_MAC80211_LEDS |
| 371 | else |
353 | 372 | ieee80211_led_rx(rx->local); |
354 | 373 | +#endif |
355 | 374 | return RX_CONTINUE; |
356 | 375 | } |
357 | 376 | |
358 | | +++ b/net/mac80211/status.c |
| 377 | --- compat-wireless-2010-07-29.orig/net/mac80211/status.c |
359 | 378 | @@ -13,7 +13,9 @@ |
360 | 379 | #include "ieee80211_i.h" |
361 | 380 | #include "rate.h" |
... | ... | |
377 | 396 | |
378 | 397 | /* SNMP counters |
379 | 398 | * Fragments are passed to low-level drivers as separate skbs, so these |
380 | | +++ b/net/mac80211/tx.c |
| 399 | --- compat-wireless-2010-07-29.orig/net/mac80211/tx.c |
381 | 400 | @@ -26,7 +26,9 @@ |
382 | 401 | |
383 | 402 | #include "ieee80211_i.h" |
... | ... | |
399 | 418 | fragm = true; |
400 | 419 | } |
401 | 420 | |
402 | | +++ b/net/mac80211/util.c |
| 421 | --- compat-wireless-2010-07-29.orig/net/mac80211/util.c |
403 | 422 | @@ -29,7 +29,9 @@ |
404 | 423 | #include "rate.h" |
405 | 424 | #include "mesh.h" |