2 files changed, 4 insertions, 4 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 92d1b2e312d4..fe603191c12c 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -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;
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index 1558b9af544c..a2dffe401c78 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -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;