diff options
| author |   johannes@sipsolutions.net <johannes@sipsolutions.net> | 2006-04-11 10:58:06 +0200 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2006-04-19 17:25:39 -0400 |
| commit | ba2f8c18756b4a99c8cd3ab6526b2ed7a8f18ead (patch) | |
| tree | 2ff973272099f0fed9214b9d47f968caee0015c1 /net/ieee80211 | |
| parent | [PATCH] bcm43xx: set trans_start on TX to prevent bogus timeouts (diff) | |
| download | linux-dev-ba2f8c18756b4a99c8cd3ab6526b2ed7a8f18ead.tar.xz linux-dev-ba2f8c18756b4a99c8cd3ab6526b2ed7a8f18ead.zip | |
[PATCH] softmac: return -EAGAIN from getscan while scanning
Below patch was developed after discussion with Daniel Drake who
mentioned to me that wireless tools expect an EAGAIN return from getscan
so that they can wait for the scan to finish before printing out the
results.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/ieee80211')
| -rw-r--r-- | net/ieee80211/softmac/ieee80211softmac_wx.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/net/ieee80211/softmac/ieee80211softmac_wx.c b/net/ieee80211/softmac/ieee80211softmac_wx.c index b559aa9b5507..00f0d4f71897 100644 --- a/net/ieee80211/softmac/ieee80211softmac_wx.c +++ b/net/ieee80211/softmac/ieee80211softmac_wx.c @@ -41,13 +41,23 @@ ieee80211softmac_wx_trigger_scan(struct net_device *net_dev, EXPORT_SYMBOL_GPL(ieee80211softmac_wx_trigger_scan); +/* if we're still scanning, return -EAGAIN so that userspace tools + * can get the complete scan results, otherwise return 0. */ int ieee80211softmac_wx_get_scan_results(struct net_device *net_dev, struct iw_request_info *info, union iwreq_data *data, char *extra) { + unsigned long flags; struct ieee80211softmac_device *sm = ieee80211_priv(net_dev); + + spin_lock_irqsave(&sm->lock, flags); + if (sm->scanning) { + spin_unlock_irqrestore(&sm->lock, flags); + return -EAGAIN; + } + spin_unlock_irqrestore(&sm->lock, flags); return ieee80211_wx_get_scan(sm->ieee, info, data, extra); } EXPORT_SYMBOL_GPL(ieee80211softmac_wx_get_scan_results); |