Skip to content

Commit

Permalink
cfg80211: add missing braces
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Johannes Berg authored and John W. Linville committed May 21, 2010
1 parent b6411fc commit 579d753
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions net/wireless/nl80211.c
Original file line number Diff line number Diff line change
Expand Up @@ -4443,9 +4443,10 @@ static int nl80211_remain_on_channel(struct sk_buff *skb,
if (channel_type != NL80211_CHAN_NO_HT &&
channel_type != NL80211_CHAN_HT20 &&
channel_type != NL80211_CHAN_HT40PLUS &&
channel_type != NL80211_CHAN_HT40MINUS)
channel_type != NL80211_CHAN_HT40MINUS) {
err = -EINVAL;
goto out;
}
}

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

freq = nla_get_u32(info->attrs[NL80211_ATTR_WIPHY_FREQ]);
Expand Down

0 comments on commit 579d753

Please sign in to comment.