Commit 68406a98 authored by James Prestwood's avatar James Prestwood Committed by Johannes Berg

mac80211_hwsim: fix overwriting of if_combination

Moved setting if_combination.num_different_channels/radar_detect_widths
into an else after use_chanctx. In the case of use_chanctx, these two
settings were getting overwritten.
Signed-off-by: default avatarJames Prestwood <james.prestwood@linux.intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent f6c7f03f
...@@ -2751,17 +2751,18 @@ static int mac80211_hwsim_new_radio(struct genl_info *info, ...@@ -2751,17 +2751,18 @@ static int mac80211_hwsim_new_radio(struct genl_info *info,
hw->wiphy->max_remain_on_channel_duration = 1000; hw->wiphy->max_remain_on_channel_duration = 1000;
data->if_combination.radar_detect_widths = 0; data->if_combination.radar_detect_widths = 0;
data->if_combination.num_different_channels = data->channels; data->if_combination.num_different_channels = data->channels;
} } else {
data->if_combination.num_different_channels = 1;
data->if_combination.n_limits = n_limits; data->if_combination.radar_detect_widths =
data->if_combination.max_interfaces = 2048;
data->if_combination.num_different_channels = 1;
data->if_combination.radar_detect_widths =
BIT(NL80211_CHAN_WIDTH_20_NOHT) | BIT(NL80211_CHAN_WIDTH_20_NOHT) |
BIT(NL80211_CHAN_WIDTH_20) | BIT(NL80211_CHAN_WIDTH_20) |
BIT(NL80211_CHAN_WIDTH_40) | BIT(NL80211_CHAN_WIDTH_40) |
BIT(NL80211_CHAN_WIDTH_80) | BIT(NL80211_CHAN_WIDTH_80) |
BIT(NL80211_CHAN_WIDTH_160); BIT(NL80211_CHAN_WIDTH_160);
}
data->if_combination.n_limits = n_limits;
data->if_combination.max_interfaces = 2048;
data->if_combination.limits = data->if_limits; data->if_combination.limits = data->if_limits;
hw->wiphy->iface_combinations = &data->if_combination; hw->wiphy->iface_combinations = &data->if_combination;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment