cfg80211: add missing braces
authorJohannes Berg <johannes@sipsolutions.net>
Tue, 18 May 2010 12:36:34 +0000 (14:36 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 21 May 2010 18:40:01 +0000 (14:40 -0400)
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>
net/wireless/nl80211.c

index aaa1aad..db71150 100644 (file)
@@ -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]);
@@ -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]);