From b58b377be90b90ac9a34931878684be895ad0e10 Mon Sep 17 00:00:00 2001 From: Simon Wunderlich Date: Thu, 29 Nov 2012 18:37:22 +0100 Subject: [PATCH] --- yaml --- r: 341980 b: refs/heads/master c: c04d61500d706b20361eef02e819b9bed8e92c01 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/wireless/nl80211.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a6e26ba45dc8..ea9b24e8d6fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f2e651c9aa4be5ace193b6a8f48e4b068a60207 +refs/heads/master: c04d61500d706b20361eef02e819b9bed8e92c01 diff --git a/trunk/net/wireless/nl80211.c b/trunk/net/wireless/nl80211.c index 0e7e8d533d98..4a719770eaaf 100644 --- a/trunk/net/wireless/nl80211.c +++ b/trunk/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];