cfg80211: fix action frame TX
Johannes Berg
maintainerPATCH 1/1 cfg80211: fix action frame TX
Specifying a valid channel type will get
goto out rather than continuing, due to
missing braces.
Signed-off-by Johannes Berg <[email protected]>
--- net/wireless/nl80211.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/wireless/nl80211.c +2 -1
@@ -4717,9 +4717,10 @@ static int nl80211_action(struct sk_buffif (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 ]);
Johannes Berg
maintainerPATCH 1/1 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 Johannes Berg <[email protected]>
---
replaces the earlier patch
net/wireless/nl80211.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
net/wireless/nl80211.c +4 -2
@@ -4443,9 +4443,10 @@ static int nl80211_remain_on_channel(strif (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_buffif (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 ]);