|
@@ -970,7 +970,7 @@ static int iwl3945_full_rxon_required(struct iwl3945_priv *priv)
|
|
{
|
|
{
|
|
|
|
|
|
/* These items are only settable from the full RXON command */
|
|
/* 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,
|
|
compare_ether_addr(priv->staging_rxon.bssid_addr,
|
|
priv->active_rxon.bssid_addr) ||
|
|
priv->active_rxon.bssid_addr) ||
|
|
compare_ether_addr(priv->staging_rxon.node_addr,
|
|
compare_ether_addr(priv->staging_rxon.node_addr,
|
|
@@ -6836,7 +6836,7 @@ static void iwl3945_config_ap(struct iwl3945_priv *priv)
|
|
return;
|
|
return;
|
|
|
|
|
|
/* The following should be done only at AP bring up */
|
|
/* 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) */
|
|
/* RXON - unassoc (to set timing command) */
|
|
priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
|
|
priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
|