cfg80211: fix reporting 5/10 MHz support to user space
PATCH 1/1 cfg80211: fix reporting 5/10 MHz support to user space
nla_put_flag needs a real nl80211 attribute id, not a wiphy flag bit
Signed-off-by Felix Fietkau <[email protected]>
--- include/uapi/linux/nl80211.h | 5 +++++ net/wireless/nl80211.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)
include/uapi/linux/nl80211.h +5 -0
@@ -1508,6 +1508,9 @@ enum nl80211_commands {* to react to radar events, e.g. initiate a channel switch or leave the * IBSS network. * +* @NL80211_ATTR_SUPPORT_5_10_MHZ: A flag indicating that the device supports +* 5 MHz and 10 MHz channel bandwidth. +* * @NL80211_ATTR_MAX: highest attribute number currently defined * @__NL80211_ATTR_AFTER_LAST: internal use */
@@ -1824,6 +1827,8 @@ enum nl80211_attrs {NL80211_ATTR_HANDLE_DFS , +NL80211_ATTR_SUPPORT_5_10_MHZ , +/* add attributes here, update the policy in nl80211.c */ __NL80211_ATTR_AFTER_LAST,
net/wireless/nl80211.c +1 -1
@@ -1229,7 +1229,7 @@ static int nl80211_send_wiphy(struct cfg80211_registered_device *dev, nla_put_flag(msg, NL80211_ATTR_TDLS_EXTERNAL_SETUP)) goto nla_put_failure;if ((dev->wiphy.flags &WIPHY_FLAG_SUPPORTS_5_10_MHZ ) && -nla_put_flag (msg,WIPHY_FLAG_SUPPORTS_5_10_MHZ )) +nla_put_flag (msg,NL80211_ATTR_SUPPORT_5_10_MHZ )) goto nla_put_failure; state->split_start++;
Signature · 1 line
1.8.3.4 (Apple Git-47)
Quoted 1 line · Felix Fietkau
nla_put_flagneeds a real nl80211 attribute id, not a wiphy flag bit
Applied to mac80211-next, the 3.12/3.13 situation is a bit more complicated so I'll disable 5/10 MHz support there.
johannes