aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-08-03 16:36:41 -0700
committerDavid S. Miller <davem@davemloft.net>2011-08-03 16:36:41 -0700
commit5be1334062a2f358dc65016b5181e6edbfe3bd1e (patch)
tree02ec7afd0cacda2f364e49f0c8391690f6b41a24 /net
parentnet: fix NULL dereferences in check_peer_redir() (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem (diff)
downloadlinux-dev-5be1334062a2f358dc65016b5181e6edbfe3bd1e.tar.xz
linux-dev-5be1334062a2f358dc65016b5181e6edbfe3bd1e.zip
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
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 28d2aa109bee..e83e7fee3bc0 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;
}