Skip to content

Commit

Permalink
[PATCH] iwlwifi: clear station table in rxon unconditionally
Browse files Browse the repository at this point in the history 
This patch clears stations table for every rxon command.
It removes iwl_rxon_add_station function in 3945.

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
Zhu Yi authored and David S. Miller committed Oct 10, 2007
1 parent e1493de commit 556f8db
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 58 deletions.
55 changes: 14 additions & 41 deletions drivers/net/wireless/iwlwifi/iwl3945-base.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,7 @@ const u8 BROADCAST_ADDR[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
*/

/**************************************************************/
#if 0 /* temparary disable till we add real remove station */
static u8 iwl_remove_station(struct iwl_priv *priv, const u8 *addr, int is_ap)
{
int index = IWL_INVALID_STATION;
Expand Down Expand Up @@ -442,7 +443,7 @@ static u8 iwl_remove_station(struct iwl_priv *priv, const u8 *addr, int is_ap)
spin_unlock_irqrestore(&priv->sta_lock, flags);
return 0;
}

#endif
static void iwl_clear_stations_table(struct iwl_priv *priv)
{
unsigned long flags;
Expand Down Expand Up @@ -834,25 +835,6 @@ int iwl_send_statistics_request(struct iwl_priv *priv)
return iwl_send_cmd_u32(priv, REPLY_STATISTICS_CMD, 0);
}

/**
* iwl_rxon_add_station - add station into station table.
*
* there is only one AP station with id= IWL_AP_ID
* NOTE: mutex must be held before calling the this fnction
*/
static int iwl_rxon_add_station(struct iwl_priv *priv,
const u8 *addr, int is_ap)
{
u8 rc;

/* Remove this station if it happens to already exist */
iwl_remove_station(priv, addr, is_ap);

rc = iwl_add_station(priv, addr, is_ap, 0);

return rc;
}

/**
* iwl_set_rxon_channel - Set the phymode and channel values in staging RXON
* @phymode: MODE_IEEE80211A sets to 5.2GHz; all else set to 2.4GHz
Expand Down Expand Up @@ -1123,16 +1105,6 @@ static int iwl_commit_rxon(struct iwl_priv *priv)
"configuration (%d).\n", rc);
return rc;
}

/* The RXON bit toggling will have cleared out the
* station table in the uCode, so blank it in the driver
* as well */
iwl_clear_stations_table(priv);
} else if (priv->staging_rxon.filter_flags & RXON_FILTER_ASSOC_MSK) {
/* When switching from non-associated to associated, the
* uCode clears out the station table; so clear it in the
* driver as well */
iwl_clear_stations_table(priv);
}

IWL_DEBUG_INFO("Sending RXON\n"
Expand All @@ -1154,6 +1126,8 @@ static int iwl_commit_rxon(struct iwl_priv *priv)

memcpy(active_rxon, &priv->staging_rxon, sizeof(*active_rxon));

iwl_clear_stations_table(priv);

/* If we issue a new RXON command which required a tune then we must
* send a new TXPOWER command or we won't be able to Tx any frames */
rc = iwl_hw_reg_send_txpower(priv);
Expand All @@ -1163,7 +1137,7 @@ static int iwl_commit_rxon(struct iwl_priv *priv)
}

/* Add the broadcast address so we can send broadcast frames */
if (iwl_rxon_add_station(priv, BROADCAST_ADDR, 0) ==
if (iwl_add_station(priv, BROADCAST_ADDR, 0, 0) ==
IWL_INVALID_STATION) {
IWL_ERROR("Error adding BROADCAST address for transmit.\n");
return -EIO;
Expand All @@ -1173,7 +1147,7 @@ static int iwl_commit_rxon(struct iwl_priv *priv)
* add the IWL_AP_ID to the station rate table */
if (iwl_is_associated(priv) &&
(priv->iw_mode == IEEE80211_IF_TYPE_STA))
if (iwl_rxon_add_station(priv, priv->active_rxon.bssid_addr, 1)
if (iwl_add_station(priv, priv->active_rxon.bssid_addr, 1, 0)
== IWL_INVALID_STATION) {
IWL_ERROR("Error adding AP address for transmit.\n");
return -EIO;
Expand Down Expand Up @@ -4658,7 +4632,7 @@ static void iwl_error_recovery(struct iwl_priv *priv)
priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
iwl_commit_rxon(priv);

iwl_rxon_add_station(priv, priv->bssid, 1);
iwl_add_station(priv, priv->bssid, 1, 0);

spin_lock_irqsave(&priv->lock, flags);
priv->assoc_id = le16_to_cpu(priv->staging_rxon.assoc_id);
Expand Down Expand Up @@ -6804,8 +6778,8 @@ static void iwl_bg_post_associate(struct work_struct *data)
/* clear out the station table */
iwl_clear_stations_table(priv);

iwl_rxon_add_station(priv, BROADCAST_ADDR, 0);
iwl_rxon_add_station(priv, priv->bssid, 0);
iwl_add_station(priv, BROADCAST_ADDR, 0, 0);
iwl_add_station(priv, priv->bssid, 0, 0);
iwl3945_sync_sta(priv, IWL_STA_ID,
(priv->phymode == MODE_IEEE80211A)?
IWL_RATE_6M_PLCP : IWL_RATE_1M_PLCP,
Expand Down Expand Up @@ -7092,10 +7066,9 @@ static void iwl_config_ap(struct iwl_priv *priv)
/* restore RXON assoc */
priv->staging_rxon.filter_flags |= RXON_FILTER_ASSOC_MSK;
iwl_commit_rxon(priv);
iwl_rxon_add_station(priv, BROADCAST_ADDR, 0);
iwl_send_beacon_cmd(priv);
} else
iwl_send_beacon_cmd(priv);
iwl_add_station(priv, BROADCAST_ADDR, 0, 0);
}
iwl_send_beacon_cmd(priv);

/* FIXME - we need to add code here to detect a totally new
* configuration, reset the AP, unassoc, rxon timing, assoc,
Expand Down Expand Up @@ -7186,8 +7159,8 @@ static int iwl_mac_config_interface(struct ieee80211_hw *hw, int if_id,
RXON_FILTER_ASSOC_MSK;
rc = iwl_commit_rxon(priv);
if ((priv->iw_mode == IEEE80211_IF_TYPE_STA) && rc)
iwl_rxon_add_station(
priv, priv->active_rxon.bssid_addr, 1);
iwl_add_station(priv,
priv->active_rxon.bssid_addr, 1, 0);
}

} else {
Expand Down
24 changes: 7 additions & 17 deletions drivers/net/wireless/iwlwifi/iwl4965-base.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,7 @@ const u8 BROADCAST_ADDR[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };

/**************************************************************/

#if 0 /* temparary disable till we add real remove station */
static u8 iwl_remove_station(struct iwl_priv *priv, const u8 *addr, int is_ap)
{
int index = IWL_INVALID_STATION;
Expand Down Expand Up @@ -442,6 +443,7 @@ static u8 iwl_remove_station(struct iwl_priv *priv, const u8 *addr, int is_ap)
spin_unlock_irqrestore(&priv->sta_lock, flags);
return 0;
}
#endif

static void iwl_clear_stations_table(struct iwl_priv *priv)
{
Expand Down Expand Up @@ -852,16 +854,12 @@ int iwl_send_statistics_request(struct iwl_priv *priv)
static int iwl_rxon_add_station(struct iwl_priv *priv,
const u8 *addr, int is_ap)
{
u8 rc;

/* Remove this station if it happens to already exist */
iwl_remove_station(priv, addr, is_ap);

rc = iwl_add_station(priv, addr, is_ap, 0);
u8 sta_id;

sta_id = iwl_add_station(priv, addr, is_ap, 0);
iwl4965_add_station(priv, addr, is_ap);

return rc;
return sta_id;
}

/**
Expand Down Expand Up @@ -1149,16 +1147,6 @@ static int iwl_commit_rxon(struct iwl_priv *priv)
"configuration (%d).\n", rc);
return rc;
}

/* The RXON bit toggling will have cleared out the
* station table in the uCode, so blank it in the driver
* as well */
iwl_clear_stations_table(priv);
} else if (priv->staging_rxon.filter_flags & RXON_FILTER_ASSOC_MSK) {
/* When switching from non-associated to associated, the
* uCode clears out the station table; so clear it in the
* driver as well */
iwl_clear_stations_table(priv);
}

IWL_DEBUG_INFO("Sending RXON\n"
Expand All @@ -1178,6 +1166,8 @@ static int iwl_commit_rxon(struct iwl_priv *priv)
return rc;
}

iwl_clear_stations_table(priv);

#ifdef CONFIG_IWLWIFI_SENSITIVITY
if (!priv->error_recovering)
priv->start_calib = 0;
Expand Down

0 comments on commit 556f8db

Please sign in to comment.