Revert "madwifi: fix compilation against Linux 3.8" - it was premature
This reverts commit 37054015dda3e65658158a7ca73262c85e8eb002. git-svn-id: svn://svn.openwrt.org/openwrt/packages@36012 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@ -307,7 +307,7 @@
|
||||
}
|
||||
|
||||
|
||||
@@ -575,6 +583,7 @@ ap_end(struct ieee80211_scan_state *ss,
|
||||
@@ -575,6 +583,7 @@ ap_end(struct ieee80211_scan_state *ss,
|
||||
struct ap_state *as = ss->ss_priv;
|
||||
struct ieee80211_channel *bestchan = NULL;
|
||||
struct ieee80211com *ic = NULL;
|
||||
@ -315,7 +315,7 @@
|
||||
int res = 1;
|
||||
|
||||
SCAN_AP_LOCK_IRQ(as);
|
||||
@@ -586,8 +595,11 @@ ap_end(struct ieee80211_scan_state *ss,
|
||||
@@ -586,8 +595,11 @@ ap_end(struct ieee80211_scan_state *ss,
|
||||
|
||||
/* record stats for the channel that was scanned last */
|
||||
ic->ic_set_channel(ic);
|
||||
@ -327,7 +327,7 @@
|
||||
if (ss->ss_last > 0) {
|
||||
/* no suitable channel, should not happen */
|
||||
printk(KERN_ERR "%s: %s: no suitable channel! "
|
||||
@@ -606,6 +618,7 @@ ap_end(struct ieee80211_scan_state *ss,
|
||||
@@ -606,6 +618,7 @@ ap_end(struct ieee80211_scan_state *ss,
|
||||
bestchan->ic_freq, bestchan->ic_flags &
|
||||
~IEEE80211_CHAN_TURBO)) == NULL) {
|
||||
/* should never happen ?? */
|
||||
@ -335,7 +335,7 @@
|
||||
SCAN_AP_UNLOCK_IRQ_EARLY(as);
|
||||
return 0;
|
||||
}
|
||||
@@ -618,6 +631,9 @@ ap_end(struct ieee80211_scan_state *ss,
|
||||
@@ -618,6 +631,9 @@ ap_end(struct ieee80211_scan_state *ss,
|
||||
as->as_action = action;
|
||||
as->as_selbss = se;
|
||||
|
||||
|
Reference in New Issue
Block a user