aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Almesberger <werner@openmoko.org>2009-01-12 09:04:45 +0000
committerAndy Green <agreen@pads.home.warmcat.com>2009-01-12 09:04:45 +0000
commit4836494d233cd34fe194ff2040d62e4109067d79 (patch)
tree7baac59c351fa63f8c16ecfd7079a54f6a1ced7a
parent0e94a8adc2f8211e21370f0d63a5652104d4974f (diff)
AR6k: don't make a fuss if SIOCGIWSCAN returns no nodes
SIOCGIWSCAN can return an empty node list if there are indeed no nodes but also if we wait too long (more than about 20 seconds) between initiating the scan and retrieving the list of nodes. There's nothing suspicious per se about either condition, yet the AR6k driver returns an error code and printk's a complaint. This is a bit excessive and can mislead user space into believing a real error has occurred. This patch make this sort of failure silent, like in other WLAN drivers, e.g., ieee80211_wx.c:ieee80211_wx_get_scan Signed-off-by: Werner Almesberger <werner@openmoko.org>
-rw-r--r--drivers/ar6000/ar6000/wireless_ext.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/ar6000/ar6000/wireless_ext.c b/drivers/ar6000/ar6000/wireless_ext.c
index 0aa4bdc1a5c..da82ad0c02a 100644
--- a/drivers/ar6000/ar6000/wireless_ext.c
+++ b/drivers/ar6000/ar6000/wireless_ext.c
@@ -245,10 +245,7 @@ ar6000_ioctl_giwscan(struct net_device *dev,
}
}
- if(!(data->length = param.current_ev - extra)) {
- printk("%s(): data length %d\n", __FUNCTION__, data->length);
- return -EAGAIN;
- }
+ data->length = param.current_ev - extra;
return 0;
}