On 2020-04-29 07:28, Johannes Berg wrote:
On Fri, 2020-04-24 at 15:41 -0700, Rajkumar Manoharan wrote:
Define new structures for HE 6 GHz band capabilities as per
per?
Oops.. My bad. Accidentally removed the commit log.
include/linux/ieee80211.h | 57
++++++++++++++++++++++++++++++++++++++++++++
include/net/cfg80211.h | 2 ++
include/uapi/linux/nl80211.h | 6 +++++
net/wireless/nl80211.c | 14 +++++++++++
This is a bit mixed up, I'd prefer the raw ieee80211.h definitions in a
separate patch.
Sure.
+ [NL80211_ATTR_HE_6GHZ_CAPABILITY] = {
+ .type = NLA_EXACT_LEN_WARN,
+ .len = NL80211_HE_6GHZ_CAPABILITY_LEN,
+ },
Shouldn't use _WARN for a new attribute. Just reject it if userspace
gets it wrong.
Done. :)
@@ -6177,6 +6185,12 @@ static int nl80211_new_station(struct sk_buff
*skb, struct genl_info *info)
return -EINVAL;
}
+ /* Ensure that HT/VHT capabilities are not set for 6 GHz HE STA */
+ if (params.he_6ghz_capa) {
+ params.ht_capa = NULL;
+ params.vht_capa = NULL;
+ }
IMHO better to reject (with a message)
Got it.
-Rajkumar
