Date:2010-08-21 18:25:08 (8 years 3 months ago)
Author:mb
Commit:87adbb0f778264b19c871bcdd5c3bed527c8ec52
Message:mac80211: Fix incorrect ifdef placement in 800-nuke_led_code.patch

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22749 3c298f89-4303-0410-b956-a3cf2f4a3e73
Files: package/mac80211/patches/800-nuke_led_code.patch (15 diffs)

Change Details

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
220@@ -115,7 +115,7 @@ CONFIG_COMPAT_MAC80211_RC_DEFAULT=minstr
321 # CONFIG_MAC80211_RC_PID=y
422 CONFIG_MAC80211_RC_MINSTREL=y
...... 
6179
6280 # Atheros
6381 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
6583@@ -146,10 +146,12 @@ static inline void __hwrng_unregister(st
6684     hwrng_unregister(rng);
6785 }
...... 
7694
7795 /**
7896  * 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
8098@@ -20,6 +20,7 @@
8199 /* LED functions */
82100 /********************************/
...... 
94112
95113 /*******************/
96114 /* Rfkill */
97+++ b/drivers/net/wireless/ath/ath9k/pci.c
115--- compat-wireless-2010-07-29.orig/drivers/net/wireless/ath/ath9k/pci.c
98116@@ -273,7 +273,9 @@ static int ath_pci_suspend(struct pci_de
99117     struct ath_wiphy *aphy = hw->priv;
100118     struct ath_softc *sc = aphy->sc;
...... 
119137
120138     return 0;
121139 }
122+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
140--- compat-wireless-2010-07-29.orig/drivers/net/wireless/ath/ath9k/ath9k.h
123141@@ -465,6 +465,7 @@ void ath9k_btcoex_timer_pause(struct ath
124142 /********************/
125143 /* LED Control */
...... 
152170+#endif
153171
154172     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
157175@@ -34,9 +34,11 @@ int modparam_nohwcrypt;
158176 module_param_named(nohwcrypt, modparam_nohwcrypt, int, 0444);
159177 MODULE_PARM_DESC(nohwcrypt, "Disable hardware encryption");
...... 
187205
188206     for (i = 0; i < sc->num_sec_wiphy; i++) {
189207         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
191209@@ -868,9 +868,11 @@ void ath_radio_enable(struct ath_softc *
192210     ath9k_hw_set_interrupts(ah, ah->imask);
193211
...... 
225243
226244     cancel_delayed_work_sync(&sc->tx_complete_work);
227245     cancel_work_sync(&sc->paprd_work);
228+++ b/net/mac80211/iface.c
246--- compat-wireless-2010-07-29.orig/net/mac80211/iface.c
229247@@ -21,7 +21,9 @@
230248 #include "sta_info.h"
231249 #include "debugfs_netdev.h"
...... 
247265     }
248266
249267     /*
250+++ b/net/mac80211/main.c
268--- compat-wireless-2010-07-29.orig/net/mac80211/main.c
251269@@ -29,7 +29,9 @@
252270 #include "rate.h"
253271 #include "mesh.h"
...... 
289307     kfree(local->int_scan_req);
290308 }
291309 EXPORT_SYMBOL(ieee80211_unregister_hw);
292+++ b/net/mac80211/mlme.c
310--- compat-wireless-2010-07-29.orig/net/mac80211/mlme.c
293311@@ -26,7 +26,9 @@
294312 #include "ieee80211_i.h"
295313 #include "driver-ops.h"
...... 
321339     changed |= BSS_CHANGED_ASSOC;
322340     sdata->vif.bss_conf.assoc = false;
323341
324+++ b/net/mac80211/pm.c
342--- compat-wireless-2010-07-29.orig/net/mac80211/pm.c
325343@@ -4,7 +4,9 @@
326344 #include "ieee80211_i.h"
327345 #include "mesh.h"
...... 
333351
334352 int __ieee80211_suspend(struct ieee80211_hw *hw)
335353 {
336+++ b/net/mac80211/rx.c
354--- compat-wireless-2010-07-29.orig/net/mac80211/rx.c
337355@@ -21,7 +21,9 @@
338356
339357 #include "ieee80211_i.h"
...... 
345363 #include "mesh.h"
346364 #include "wep.h"
347365 #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++;
349368     if (is_multicast_ether_addr(hdr->addr1))
350369         rx->local->dot11MulticastReceivedFrameCount++;
351     else
352370+#ifdef CONFIG_MAC80211_LEDS
371     else
353372         ieee80211_led_rx(rx->local);
354373+#endif
355374     return RX_CONTINUE;
356375 }
357376
358+++ b/net/mac80211/status.c
377--- compat-wireless-2010-07-29.orig/net/mac80211/status.c
359378@@ -13,7 +13,9 @@
360379 #include "ieee80211_i.h"
361380 #include "rate.h"
...... 
377396
378397     /* SNMP counters
379398      * 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
381400@@ -26,7 +26,9 @@
382401
383402 #include "ieee80211_i.h"
...... 
399418         fragm = true;
400419     }
401420
402+++ b/net/mac80211/util.c
421--- compat-wireless-2010-07-29.orig/net/mac80211/util.c
403422@@ -29,7 +29,9 @@
404423 #include "rate.h"
405424 #include "mesh.h"

Archive Download the corresponding diff file



interactive