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

Commit 1ae2fc25 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211_hwsim: advertise interface combinations 



Enforcing interface combinations broke uses of hwsim
with multiple virtual interfaces. Advertise that all
combinations are possible to fix this.

Reported-by: default avatarNirav Shah <nirav.j2.shah@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent bd34ab62

drivers/net/wireless/mac80211_hwsim.c

+21 −0
Original line number Diff line number Diff line
@@ -1721,6 +1721,24 @@ static void hwsim_exit_netlink(void) 
		       "unregister family %i\n", ret);

}



static const struct ieee80211_iface_limit hwsim_if_limits[] = {

	{ .max = 1, .types = BIT(NL80211_IFTYPE_ADHOC) },

	{ .max = 2048,  .types = BIT(NL80211_IFTYPE_STATION) |

				 BIT(NL80211_IFTYPE_P2P_CLIENT) |

#ifdef CONFIG_MAC80211_MESH

				 BIT(NL80211_IFTYPE_MESH_POINT) |

#endif

				 BIT(NL80211_IFTYPE_AP) |

				 BIT(NL80211_IFTYPE_P2P_GO) },

};



static const struct ieee80211_iface_combination hwsim_if_comb = {

	.limits = hwsim_if_limits,

	.n_limits = ARRAY_SIZE(hwsim_if_limits),

	.max_interfaces = 2048,

	.num_different_channels = 1,

};



static int __init init_mac80211_hwsim(void)

{

	int i, err = 0;
@@ -1782,6 +1800,9 @@ static int __init init_mac80211_hwsim(void) 
		hw->wiphy->n_addresses = 2;

		hw->wiphy->addresses = data->addresses;



		hw->wiphy->iface_combinations = &hwsim_if_comb;

		hw->wiphy->n_iface_combinations = 1;



		if (fake_hw_scan) {

			hw->wiphy->max_scan_ssids = 255;

			hw->wiphy->max_scan_ie_len = IEEE80211_MAX_DATA_LEN;