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

Commit b59ec8dd authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211_hwsim: fix number of channels in interface combinations 



There's little point in setting the number of channels if the
entire combination struct is overwritten again later - that
was clearly intended the other way around, fix it.

Reported-by: default avatarLuciano Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 4bf332c7

drivers/net/wireless/mac80211_hwsim.c

+1 −1
Original line number Diff line number Diff line
@@ -2004,11 +2004,11 @@ static int mac80211_hwsim_create_radio(int channels, const char *reg_alpha2, 
		/* For channels > 1 DFS is not allowed */

		hw->wiphy->n_iface_combinations = 1;

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

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

		if (p2p_device)

			data->if_combination = hwsim_if_comb_p2p_dev[0];

		else

			data->if_combination = hwsim_if_comb[0];

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

	} else if (p2p_device) {

		hw->wiphy->iface_combinations = hwsim_if_comb_p2p_dev;

		hw->wiphy->n_iface_combinations =