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

Commit 5306c080 authored by Johannes Berg's avatar Johannes Berg Committed by Wey-Yi Guy
Browse files

iwlagn: fix change_interface for P2P types 



When an interface changes type to a P2P type,
iwlagn will erroneously set vif->type to the
P2P type and not the reduced/split type. Fix
this by keeping "newtype" in another variable
for the assignment to vif->type.

Cc: stable@kernel.org [2.6.38+]
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 77e569ed

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -1763,6 +1763,7 @@ int iwl_mac_change_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
	struct iwl_rxon_context *ctx = iwl_rxon_ctx_from_vif(vif);

	struct iwl_rxon_context *ctx = iwl_rxon_ctx_from_vif(vif);

	struct iwl_rxon_context *bss_ctx = &priv->contexts[IWL_RXON_CTX_BSS];

	struct iwl_rxon_context *bss_ctx = &priv->contexts[IWL_RXON_CTX_BSS];

	struct iwl_rxon_context *tmp;

	struct iwl_rxon_context *tmp;

	enum nl80211_iftype newviftype = newtype;

	u32 interface_modes;

	u32 interface_modes;

	int err;

	int err;
@@ -1818,7 +1819,7 @@ int iwl_mac_change_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 




	/* success */

	/* success */

	iwl_teardown_interface(priv, vif, true);

	iwl_teardown_interface(priv, vif, true);

	vif->type = newtype;

	vif->type = newviftype;

	vif->p2p = newp2p;

	vif->p2p = newp2p;

	err = iwl_setup_interface(priv, ctx);

	err = iwl_setup_interface(priv, ctx);

	WARN_ON(err);

	WARN_ON(err);