Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cfg80211: add missing braces

Browse source 
Specifying a valid channel type will get
goto out rather than continuing, due to
missing braces. This affects both remain
on channel and action frame TX commands.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Johannes Berg 2010-05-18 14:36:34 +02:00 committed by John W. Linville
parent b6411fc23c
commit 579d7534ca
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
net/wireless/nl80211.c
View file

@ -4443,9 +4443,10 @@ static int nl80211_remain_on_channel(struct sk_buff *skb,
if (channel_type != NL80211_CHAN_NO_HT && if (channel_type != NL80211_CHAN_NO_HT &&
channel_type != NL80211_CHAN_HT20 && channel_type != NL80211_CHAN_HT20 &&
channel_type != NL80211_CHAN_HT40PLUS && channel_type != NL80211_CHAN_HT40PLUS &&
channel_type != NL80211_CHAN_HT40MINUS) channel_type != NL80211_CHAN_HT40MINUS) {
err = -EINVAL; err = -EINVAL;
goto out; goto out;
}
} }
freq = nla_get_u32(info->attrs[NL80211_ATTR_WIPHY_FREQ]); freq = nla_get_u32(info->attrs[NL80211_ATTR_WIPHY_FREQ]);
@ -4717,9 +4718,10 @@ static int nl80211_action(struct sk_buff *skb, struct genl_info *info)
if (channel_type != NL80211_CHAN_NO_HT && if (channel_type != NL80211_CHAN_NO_HT &&
channel_type != NL80211_CHAN_HT20 && channel_type != NL80211_CHAN_HT20 &&
channel_type != NL80211_CHAN_HT40PLUS && channel_type != NL80211_CHAN_HT40PLUS &&
channel_type != NL80211_CHAN_HT40MINUS) channel_type != NL80211_CHAN_HT40MINUS) {
err = -EINVAL; err = -EINVAL;
goto out; goto out;
}
} }
freq = nla_get_u32(info->attrs[NL80211_ATTR_WIPHY_FREQ]); freq = nla_get_u32(info->attrs[NL80211_ATTR_WIPHY_FREQ]);