]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
wifi: mac80211_hwsim: Do not declare NAN support for Extended Key ID
authorIlan Peer <ilan.peer@intel.com>
Fri, 15 May 2026 11:15:16 +0000 (14:15 +0300)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 20 May 2026 10:03:28 +0000 (12:03 +0200)
Do not declare support for Extended Key ID for NAN, as defined in
section 7.4 in the WiFi Aware specification v4.0 (in order to support
security association upgrade).

Fixes: eaa7ce66c3e2 ("wifi: mac80211_hwsim: Fix possible NULL dereference")
Signed-off-by: Ilan Peer <ilan.peer@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20260515141442.365ca3ab29f9.Ib435168dcc1d7d8719a5612109035ca1950967ed@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
drivers/net/wireless/virtual/mac80211_hwsim_main.c

index 8d4de9d282b0cab45166fbd023a9780731a7d0b6..67a33e5e7d541c6f0cf3af0935456bd1d595ee70 100644 (file)
@@ -5735,8 +5735,6 @@ static int mac80211_hwsim_new_radio(struct genl_info *info,
 
                hw->wiphy->nan_capa.n_antennas = 0x22;
                hw->wiphy->nan_capa.max_channel_switch_time = 0;
-               hw->wiphy->nan_capa.dev_capabilities =
-                       NAN_DEV_CAPA_EXT_KEY_ID_SUPPORTED;
 
                wiphy_ext_feature_set(hw->wiphy,
                                      NL80211_EXT_FEATURE_SECURE_NAN);