summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2011-08-03 09:18:21 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-08-03 09:18:21 -0400
commita5d5a914770a81a1f775be2ee35b9fa8fd19d381 (patch)
treeed07597966e91e3903faf305d69a2c5e1d109b91 /net
parentd5eab9152a3b4ce962c02ad0a0e4d0ec94aadd92 (diff)
parentf35291082294ca6737953bbe4e9491ede04ab822 (diff)
downloadlinux-3.10-a5d5a914770a81a1f775be2ee35b9fa8fd19d381.tar.gz
linux-3.10-a5d5a914770a81a1f775be2ee35b9fa8fd19d381.tar.bz2
linux-3.10-a5d5a914770a81a1f775be2ee35b9fa8fd19d381.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'net')
-rw-r--r--net/wireless/nl80211.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 28d2aa109be..e83e7fee3bc 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -3464,7 +3464,7 @@ static int nl80211_trigger_scan(struct sk_buff *skb, struct genl_info *info)
tmp) {
enum ieee80211_band band = nla_type(attr);
- if (band < 0 || band > IEEE80211_NUM_BANDS) {
+ if (band < 0 || band >= IEEE80211_NUM_BANDS) {
err = -EINVAL;
goto out_free;
}