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

Commit 5d1e2325 authored by Ron Rindjunsky's avatar Ron Rindjunsky Committed by John W. Linville
Browse files

iwlwifi: use iwl_is_associated when possible 



This patch add uses of iwl_is_associated in places it is suitable in.

Signed-off-by: default avatarRon Rindjunsky <ron.rindjunsky@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 24e5c401

drivers/net/wireless/iwlwifi/iwl3945-base.c

+2 −2
Original line number Diff line number Diff line
@@ -970,7 +970,7 @@ static int iwl3945_full_rxon_required(struct iwl3945_priv *priv) 
{



	/* These items are only settable from the full RXON command */

	if (!(priv->active_rxon.filter_flags & RXON_FILTER_ASSOC_MSK) ||

	if (!(iwl3945_is_associated(priv)) ||

	    compare_ether_addr(priv->staging_rxon.bssid_addr,

			       priv->active_rxon.bssid_addr) ||

	    compare_ether_addr(priv->staging_rxon.node_addr,
@@ -6836,7 +6836,7 @@ static void iwl3945_config_ap(struct iwl3945_priv *priv) 
		return;



	/* The following should be done only at AP bring up */

	if ((priv->active_rxon.filter_flags & RXON_FILTER_ASSOC_MSK) == 0) {

	if (!(iwl3945_is_associated(priv))) {



		/* RXON - unassoc (to set timing command) */

		priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK;

drivers/net/wireless/iwlwifi/iwl4965-base.c

+2 −2
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ static int iwl4965_full_rxon_required(struct iwl_priv *priv) 
{



	/* These items are only settable from the full RXON command */

	if (!(priv->active_rxon.filter_flags & RXON_FILTER_ASSOC_MSK) ||

	if (!(iwl_is_associated(priv)) ||

	    compare_ether_addr(priv->staging_rxon.bssid_addr,

			       priv->active_rxon.bssid_addr) ||

	    compare_ether_addr(priv->staging_rxon.node_addr,
@@ -3008,7 +3008,7 @@ static void iwl4965_config_ap(struct iwl_priv *priv) 
		return;



	/* The following should be done only at AP bring up */

	if ((priv->active_rxon.filter_flags & RXON_FILTER_ASSOC_MSK) == 0) {

	if (!(iwl_is_associated(priv))) {



		/* RXON - unassoc (to set timing command) */

		priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK;