* [PATCH] cfg80211: fix action frame TX
@ 2010-05-18 11:13 Johannes Berg
2010-05-18 12:36 ` [PATCH] cfg80211: add missing braces Johannes Berg
0 siblings, 1 reply; 2+ messages in thread
From: Johannes Berg @ 2010-05-18 11:13 UTC (permalink / raw)
To: John Linville; +Cc: Jouni Malinen, linux-wireless
Specifying a valid channel type will get
goto out rather than continuing, due to
missing braces.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
---
net/wireless/nl80211.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- wireless-testing.orig/net/wireless/nl80211.c 2010-05-18 13:09:26.000000000 +0200
+++ wireless-testing/net/wireless/nl80211.c 2010-05-18 13:09:37.000000000 +0200
@@ -4717,9 +4717,10 @@ static int nl80211_action(struct sk_buff
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]);
^ permalink raw reply [flat|nested] 2+ messages in thread* [PATCH] cfg80211: add missing braces
2010-05-18 11:13 [PATCH] cfg80211: fix action frame TX Johannes Berg
@ 2010-05-18 12:36 ` Johannes Berg
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Berg @ 2010-05-18 12:36 UTC (permalink / raw)
To: John Linville; +Cc: Jouni Malinen, linux-wireless
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>
---
replaces the earlier patch
net/wireless/nl80211.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--- wireless-testing.orig/net/wireless/nl80211.c 2010-05-18 13:09:26.000000000 +0200
+++ wireless-testing/net/wireless/nl80211.c 2010-05-18 14:35:20.000000000 +0200
@@ -4443,9 +4443,10 @@ static int nl80211_remain_on_channel(str
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
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]);
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-05-18 12:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-18 11:13 [PATCH] cfg80211: fix action frame TX Johannes Berg
2010-05-18 12:36 ` [PATCH] cfg80211: add missing braces Johannes Berg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox