Thread: [Madwifi-cvs] revision 2515 committed
Status: Beta
Brought to you by:
otaku
From: Matthew W. S. B. <svn...@ma...> - 2007-06-25 04:25:22
|
Project : madwifi Revision : 2515 Author : mentor (Matthew W. S. Bell) Date : 2007-06-25 06:25:18 +0200 (Mon, 25 Jun 2007) Log Message : Remove a race. It may be an irrelevant race. Affected Files: * trunk/net80211/ieee80211_scan.c updated Modified: trunk/net80211/ieee80211_scan.c =================================================================== --- trunk/net80211/ieee80211_scan.c 2007-06-25 04:08:23 UTC (rev 2514) +++ trunk/net80211/ieee80211_scan.c 2007-06-25 04:25:18 UTC (rev 2515) @@ -371,6 +371,7 @@ struct ieee80211com *ic = vap->iv_ic; const struct ieee80211_scanner *scan; struct ieee80211_scan_state *ss = ic->ic_scan; + int scanning; scan = ieee80211_scanner_get(vap->iv_opmode, 0); if (scan == NULL) { @@ -430,10 +431,11 @@ "%s: %s scan already in progress\n", __func__, ss->ss_flags & IEEE80211_SCAN_ACTIVE ? "active" : "passive"); } + + scanning = (ic->ic_flags & IEEE80211_F_SCAN); IEEE80211_UNLOCK_IRQ(ic); - /* NB: racey, does it matter? */ - return (ic->ic_flags & IEEE80211_F_SCAN); + return scanning; } EXPORT_SYMBOL(ieee80211_start_scan); @@ -525,6 +527,7 @@ { struct ieee80211com *ic = vap->iv_ic; struct ieee80211_scan_state *ss = ic->ic_scan; + int scanning; IEEE80211_LOCK_IRQ(ic); if ((ic->ic_flags & IEEE80211_F_SCAN) == 0) { @@ -586,10 +589,11 @@ "%s: %s scan already in progress\n", __func__, ss->ss_flags & IEEE80211_SCAN_ACTIVE ? "active" : "passive"); } + + scanning = (ic->ic_flags & IEEE80211_F_SCAN); IEEE80211_UNLOCK_IRQ(ic); - /* NB: racey, does it matter? */ - return (ic->ic_flags & IEEE80211_F_SCAN); + return scanning; } EXPORT_SYMBOL(ieee80211_bg_scan); |