From 76ae23b47b36730f024fd2a0cfba35e4534eba39 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Tue, 18 May 2010 14:36:34 +0200 Subject: [PATCH] --- yaml --- r: 198605 b: refs/heads/master c: 579d7534ca83235794b6d9ef3cd473ffc14e9d42 h: refs/heads/master i: 198603: bc986138e120782f11de682174b3f9eea3306bb8 v: v3 --- [refs] | 2 +- trunk/net/wireless/nl80211.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b558f8540fec..09e7726d5779 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b6411fc23c70d7a9f57a0bfb35212ad92b5c2b5e +refs/heads/master: 579d7534ca83235794b6d9ef3cd473ffc14e9d42 diff --git a/trunk/net/wireless/nl80211.c b/trunk/net/wireless/nl80211.c index aaa1aad566cd..db71150b8040 100644 --- a/trunk/net/wireless/nl80211.c +++ b/trunk/net/wireless/nl80211.c @@ -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]);