From: Daniel Gabay Increase interface limits for NAN_DATA interface. Signed-off-by: Daniel Gabay Signed-off-by: Miri Korenblit --- drivers/net/wireless/virtual/mac80211_hwsim_i.h | 4 ++-- drivers/net/wireless/virtual/mac80211_hwsim_main.c | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/virtual/mac80211_hwsim_i.h b/drivers/net/wireless/virtual/mac80211_hwsim_i.h index 5378f721c299..d182b5117bfb 100644 --- a/drivers/net/wireless/virtual/mac80211_hwsim_i.h +++ b/drivers/net/wireless/virtual/mac80211_hwsim_i.h @@ -4,7 +4,7 @@ * Copyright (c) 2008, Jouni Malinen * Copyright (c) 2011, Javier Lopez * Copyright (c) 2016 - 2017 Intel Deutschland GmbH - * Copyright (C) 2018 - 2025 Intel Corporation + * Copyright (C) 2018 - 2026 Intel Corporation */ #ifndef __MAC80211_HWSIM_I_H @@ -39,7 +39,7 @@ struct mac80211_hwsim_data { struct ieee80211_channel channels_s1g[HWSIM_NUM_S1G_CHANNELS_US]; struct ieee80211_rate rates[HWSIM_NUM_RATES]; struct ieee80211_iface_combination if_combination; - struct ieee80211_iface_limit if_limits[4]; + struct ieee80211_iface_limit if_limits[5]; int n_if_limits; /* Storage space for channels, etc. */ struct mac80211_hwsim_phy_data *phy_data; diff --git a/drivers/net/wireless/virtual/mac80211_hwsim_main.c b/drivers/net/wireless/virtual/mac80211_hwsim_main.c index 969ebc28cb1e..3397acfe61c8 100644 --- a/drivers/net/wireless/virtual/mac80211_hwsim_main.c +++ b/drivers/net/wireless/virtual/mac80211_hwsim_main.c @@ -4,7 +4,7 @@ * Copyright (c) 2008, Jouni Malinen * Copyright (c) 2011, Javier Lopez * Copyright (c) 2016 - 2017 Intel Deutschland GmbH - * Copyright (C) 2018 - 2025 Intel Corporation + * Copyright (C) 2018 - 2026 Intel Corporation */ /* @@ -5631,6 +5631,12 @@ static int mac80211_hwsim_new_radio(struct genl_info *info, spin_lock_init(&data->nan.state_lock); } + if (param->iftypes & BIT(NL80211_IFTYPE_NAN_DATA)) { + data->if_limits[n_limits].max = 2; + data->if_limits[n_limits].types = BIT(NL80211_IFTYPE_NAN_DATA); + n_limits++; + } + data->if_combination.radar_detect_widths = BIT(NL80211_CHAN_WIDTH_5) | BIT(NL80211_CHAN_WIDTH_10) | -- 2.34.1