nl80211: split 5 and 10 mhz capability flags
PATCH 1/1 nl80211: split 5 and 10 mhz capability flags
This helps in case we need to support hardware that can only do one of the two.
Signed-off-by Felix Fietkau <[email protected]>
--- include/uapi/linux/nl80211.h | 10 +++++++--- net/wireless/nl80211.c | 3 ++- 2 files changed, 9 insertions(+), 4 deletions(-)
include/uapi/linux/nl80211.h +7 -3
@@ -1515,8 +1515,11 @@ 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_SUPPORT_5_MHZ: A flag indicating that the device supports +* 5 MHz channel bandwidth. +* +* @NL80211_ATTR_SUPPORT_10_MHZ: A flag indicating that the device supports +* 10 MHz channel bandwidth. * * @NL80211_ATTR_MAX: highest attribute number currently defined * @__NL80211_ATTR_AFTER_LAST: internal use
@@ -1834,7 +1837,8 @@ enum nl80211_attrs {NL80211_ATTR_HANDLE_DFS , - NL80211_ATTR_SUPPORT_5_10_MHZ, +NL80211_ATTR_SUPPORT_5_MHZ , + NL80211_ATTR_SUPPORT_10_MHZ,/* add attributes here, update the policy in nl80211.c */
net/wireless/nl80211.c +2 -1
@@ -1229,7 +1229,8 @@ 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,NL80211_ATTR_SUPPORT_5_10_MHZ )) + (nla_put_flag (msg,NL80211_ATTR_SUPPORT_5_MHZ ) || +nla_put_flag (msg,NL80211_ATTR_SUPPORT_10_MHZ ))) goto nla_put_failure; state->split_start++;
Signature · 1 line
1.8.3.4 (Apple Git-47)
Quoted 2 lines · Felix Fietkau
This helps in case we need to support hardware that can only do one of the two.
Applied. I also moved the code and squashed this into the right previous patch ...
johannes