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

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

iwlagn: fix interface combinations 



My patch to advertise interface combinations
worked by pure luck in the P2P case, but all
other cases are broken. This is due to a dumb
mistake in the code that checks what should
be advertised, fix that.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5bc9890f

drivers/net/wireless/iwlwifi/iwl-agn.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -2533,11 +2533,11 @@ static int iwl_mac_setup_register(struct iwl_priv *priv, 




	BUILD_BUG_ON(NUM_IWL_RXON_CTX != 2);

	BUILD_BUG_ON(NUM_IWL_RXON_CTX != 2);





	if (hw->wiphy->interface_modes & NL80211_IFTYPE_P2P_CLIENT) {

	if (hw->wiphy->interface_modes & BIT(NL80211_IFTYPE_P2P_CLIENT)) {

		hw->wiphy->iface_combinations = iwlagn_iface_combinations_p2p;

		hw->wiphy->iface_combinations = iwlagn_iface_combinations_p2p;

		hw->wiphy->n_iface_combinations =

		hw->wiphy->n_iface_combinations =

			ARRAY_SIZE(iwlagn_iface_combinations_p2p);

			ARRAY_SIZE(iwlagn_iface_combinations_p2p);

	} else if (hw->wiphy->interface_modes & NL80211_IFTYPE_AP) {

	} else if (hw->wiphy->interface_modes & BIT(NL80211_IFTYPE_AP)) {

		hw->wiphy->iface_combinations = iwlagn_iface_combinations_dualmode;

		hw->wiphy->iface_combinations = iwlagn_iface_combinations_dualmode;

		hw->wiphy->n_iface_combinations =

		hw->wiphy->n_iface_combinations =

			ARRAY_SIZE(iwlagn_iface_combinations_dualmode);

			ARRAY_SIZE(iwlagn_iface_combinations_dualmode);