diff options
| author | Simon Wunderlich <simon.wunderlich@s2003.tu-chemnitz.de> | 2012-11-29 18:37:22 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-11-29 18:44:57 +0100 |
| commit | c04d61500d706b20361eef02e819b9bed8e92c01 (patch) | |
| tree | 115721a9862c4454ba4e1abf51c9b2abc5e99db2 | |
| parent | 1f2e651c9aa4be5ace193b6a8f48e4b068a60207 (diff) | |
| download | linux-3.10-c04d61500d706b20361eef02e819b9bed8e92c01.tar.gz linux-3.10-c04d61500d706b20361eef02e819b9bed8e92c01.tar.bz2 linux-3.10-c04d61500d706b20361eef02e819b9bed8e92c01.zip | |
nl80211: Fix HT_IBSS feature check in ibss_join
There is a standalone if, seems to be a regression of commit
"nl80211/cfg80211: add VHT MCS support".
Signed-off-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
| -rw-r--r-- | net/wireless/nl80211.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 0e7e8d533d9..4a719770eaa 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -5502,6 +5502,7 @@ static int nl80211_join_ibss(struct sk_buff *skb, struct genl_info *info) return -EINVAL; if (ibss.chandef.width != NL80211_CHAN_WIDTH_20_NOHT && !(rdev->wiphy.features & NL80211_FEATURE_HT_IBSS)) + return -EINVAL; ibss.channel_fixed = !!info->attrs[NL80211_ATTR_FREQ_FIXED]; ibss.privacy = !!info->attrs[NL80211_ATTR_PRIVACY]; |