Skip to content

Commit

Permalink
iwlwifi: use iwl_is_associated when possible
Browse files Browse the repository at this point in the history
This patch add uses of iwl_is_associated in places it is suitable in.

Signed-off-by: Ron Rindjunsky <ron.rindjunsky@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Ron Rindjunsky authored and John W. Linville committed Jun 30, 2008
1 parent 24e5c40 commit 5d1e232
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions drivers/net/wireless/iwlwifi/iwl3945-base.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/wireless/iwlwifi/iwl4965-base.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 5d1e232

Please sign in to comment.