]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
wifi: mac80211_hwsim: remove NAN by default
authorJohannes Berg <johannes.berg@intel.com>
Thu, 8 Jan 2026 13:31:38 +0000 (14:31 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 12 Jan 2026 18:48:30 +0000 (19:48 +0100)
We're improving NAN support, but NAN datapath support also
means we need to change some other things, e.g. related to
rate control. Remove NAN by default again from hwsim since
it's the much newer feature.

Link: https://patch.msgid.link/20260108143139.0d4af6ae3609.Ie444b9f5aedabc713c6a1279b5b55976cfb4c465@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
drivers/net/wireless/virtual/mac80211_hwsim.c

index 551f5eb4e747753c947fc33957e78f255b03c81d..df145d911f9a8d3685f6d97fde38397d9811315b 100644 (file)
@@ -7163,14 +7163,12 @@ static int __init init_mac80211_hwsim(void)
                }
 
                param.p2p_device = support_p2p_device;
-               param.nan_device = true;
                param.mlo = mlo;
                param.multi_radio = multi_radio;
                param.use_chanctx = channels > 1 || mlo || multi_radio;
                param.iftypes = HWSIM_IFTYPE_SUPPORT_MASK;
                if (param.p2p_device)
                        param.iftypes |= BIT(NL80211_IFTYPE_P2P_DEVICE);
-               param.iftypes |= BIT(NL80211_IFTYPE_NAN);
 
                err = mac80211_hwsim_new_radio(NULL, &param);
                if (err < 0)