nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

mac80211_hwsim: fix number of channels in interface combinations

Browse source 
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: Luciano Coelho <luciano.coelho@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2014-02-07 10:44:50 +01:00
parent 4bf332c785
commit b59ec8dd43
1 changed files with 1 additions and 1 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/net/wireless/mac80211_hwsim.c
View file

@ -2004,11 +2004,11 @@ static int mac80211_hwsim_create_radio(int channels, const char *reg_alpha2,
/* For channels > 1 DFS is not allowed */ /* For channels > 1 DFS is not allowed */
hw->wiphy->n_iface_combinations = 1; hw->wiphy->n_iface_combinations = 1;
hw->wiphy->iface_combinations = &data->if_combination; hw->wiphy->iface_combinations = &data->if_combination;
data->if_combination.num_different_channels = data->channels;
if (p2p_device) if (p2p_device)
data->if_combination = hwsim_if_comb_p2p_dev[0]; data->if_combination = hwsim_if_comb_p2p_dev[0];
else else
data->if_combination = hwsim_if_comb[0]; data->if_combination = hwsim_if_comb[0];
data->if_combination.num_different_channels = data->channels;
} else if (p2p_device) { } else if (p2p_device) {
hw->wiphy->iface_combinations = hwsim_if_comb_p2p_dev; hw->wiphy->iface_combinations = hwsim_if_comb_p2p_dev;
hw->wiphy->n_iface_combinations = hw->wiphy->n_iface_combinations =