Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7736f50 authored by Ilan Peer's avatar Ilan Peer Committed by Johannes Berg
Browse files

mac80211_hwsim: Add radar bandwidths to the P2P Device combination 



Add radar_detect_widths to the interface combination that allows
concurrent P2P Device dedicated interface and AP interfaces, to enable
testing of radar detection when P2P Device interface is used.

Clear the radar_detect_widths in case of multi channel contexts
as this is not currently supported.

As radar_detect_widths are now supported in all combinations,
remove the hwsim_if_dfs_limits definition since it is no longer
needed.

Signed-off-by: default avatarIlan Peer <ilan.peer@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent c6e6a0c8

drivers/net/wireless/mac80211_hwsim.c

+5 −20
Original line number Diff line number Diff line
@@ -457,10 +457,6 @@ static const struct ieee80211_iface_limit hwsim_if_limits[] = { 
	{ .max = 1, .types = BIT(NL80211_IFTYPE_P2P_DEVICE) }

};



static const struct ieee80211_iface_limit hwsim_if_dfs_limits[] = {

	{ .max = 8, .types = BIT(NL80211_IFTYPE_AP) },

};



static const struct ieee80211_iface_combination hwsim_if_comb[] = {

	{

		.limits = hwsim_if_limits,
@@ -468,18 +464,12 @@ static const struct ieee80211_iface_combination hwsim_if_comb[] = { 
		.n_limits = ARRAY_SIZE(hwsim_if_limits) - 1,

		.max_interfaces = 2048,

		.num_different_channels = 1,

	},

	{

		.limits = hwsim_if_dfs_limits,

		.n_limits = ARRAY_SIZE(hwsim_if_dfs_limits),

		.max_interfaces = 8,

		.num_different_channels = 1,

		.radar_detect_widths = BIT(NL80211_CHAN_WIDTH_20_NOHT) |

				       BIT(NL80211_CHAN_WIDTH_20) |

				       BIT(NL80211_CHAN_WIDTH_40) |

				       BIT(NL80211_CHAN_WIDTH_80) |

				       BIT(NL80211_CHAN_WIDTH_160),

	}

	},

};



static const struct ieee80211_iface_combination hwsim_if_comb_p2p_dev[] = {
@@ -488,18 +478,12 @@ static const struct ieee80211_iface_combination hwsim_if_comb_p2p_dev[] = { 
		.n_limits = ARRAY_SIZE(hwsim_if_limits),

		.max_interfaces = 2048,

		.num_different_channels = 1,

	},

	{

		.limits = hwsim_if_dfs_limits,

		.n_limits = ARRAY_SIZE(hwsim_if_dfs_limits),

		.max_interfaces = 8,

		.num_different_channels = 1,

		.radar_detect_widths = BIT(NL80211_CHAN_WIDTH_20_NOHT) |

				       BIT(NL80211_CHAN_WIDTH_20) |

				       BIT(NL80211_CHAN_WIDTH_40) |

				       BIT(NL80211_CHAN_WIDTH_80) |

				       BIT(NL80211_CHAN_WIDTH_160),

	}

	},

};



static spinlock_t hwsim_radio_lock;
@@ -2487,13 +2471,14 @@ static int mac80211_hwsim_new_radio(struct genl_info *info, 
		hw->wiphy->max_scan_ssids = 255;

		hw->wiphy->max_scan_ie_len = IEEE80211_MAX_DATA_LEN;

		hw->wiphy->max_remain_on_channel_duration = 1000;

		/* For channels > 1 DFS is not allowed */

		hw->wiphy->n_iface_combinations = 1;

		hw->wiphy->iface_combinations = &data->if_combination;

		if (param->p2p_device)

			data->if_combination = hwsim_if_comb_p2p_dev[0];

		else

			data->if_combination = hwsim_if_comb[0];

		hw->wiphy->n_iface_combinations = 1;

		/* For channels > 1 DFS is not allowed */

		data->if_combination.radar_detect_widths = 0;

		data->if_combination.num_different_channels = data->channels;

	} else if (param->p2p_device) {

		hw->wiphy->iface_combinations = hwsim_if_comb_p2p_dev;