Commit 579d7534 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville

cfg80211: add missing braces

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: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b6411fc2
...@@ -4443,10 +4443,11 @@ static int nl80211_remain_on_channel(struct sk_buff *skb, ...@@ -4443,10 +4443,11 @@ 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]);
chan = rdev_freq_to_chan(rdev, freq, channel_type); chan = rdev_freq_to_chan(rdev, freq, channel_type);
...@@ -4717,10 +4718,11 @@ static int nl80211_action(struct sk_buff *skb, struct genl_info *info) ...@@ -4717,10 +4718,11 @@ 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]);
chan = rdev_freq_to_chan(rdev, freq, channel_type); chan = rdev_freq_to_chan(rdev, freq, channel_type);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment