diff options
author | Abhijeet Kolekar <abhijeet.kolekar@intel.com> | 2009-04-08 14:26:41 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-04-22 16:54:42 -0400 |
commit | e11bc0286a4ff8f4e5cdefbcce0878d29c03c630 (patch) | |
tree | 0c0c6ee326fd19403fe884217af0e60a7570accc /drivers/net/wireless/iwlwifi/iwl-agn.c | |
parent | 40ace5b385ccf8a4d4d096b353b7f1baac1d014b (diff) |
iwlwifi: use station management ops
Patch replaces station management functions with ops declared.
Signed-off-by: Abhijeet Kolekar <abhijeet.kolekar@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 50ef649b1c97..565a441052eb 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -188,7 +188,7 @@ int iwl_commit_rxon(struct iwl_priv *priv) | |||
188 | memcpy(active_rxon, &priv->staging_rxon, sizeof(*active_rxon)); | 188 | memcpy(active_rxon, &priv->staging_rxon, sizeof(*active_rxon)); |
189 | } | 189 | } |
190 | 190 | ||
191 | iwl_clear_stations_table(priv); | 191 | priv->cfg->ops->smgmt->clear_station_table(priv); |
192 | 192 | ||
193 | if (!priv->error_recovering) | 193 | if (!priv->error_recovering) |
194 | priv->start_calib = 0; | 194 | priv->start_calib = 0; |
@@ -593,7 +593,7 @@ static int iwl_set_mode(struct iwl_priv *priv, int mode) | |||
593 | iwl_set_rxon_chain(priv); | 593 | iwl_set_rxon_chain(priv); |
594 | memcpy(priv->staging_rxon.node_addr, priv->mac_addr, ETH_ALEN); | 594 | memcpy(priv->staging_rxon.node_addr, priv->mac_addr, ETH_ALEN); |
595 | 595 | ||
596 | iwl_clear_stations_table(priv); | 596 | priv->cfg->ops->smgmt->clear_station_table(priv); |
597 | 597 | ||
598 | /* dont commit rxon if rf-kill is on*/ | 598 | /* dont commit rxon if rf-kill is on*/ |
599 | if (!iwl_is_ready_rf(priv)) | 599 | if (!iwl_is_ready_rf(priv)) |
@@ -1471,7 +1471,7 @@ static void iwl_alive_start(struct iwl_priv *priv) | |||
1471 | goto restart; | 1471 | goto restart; |
1472 | } | 1472 | } |
1473 | 1473 | ||
1474 | iwl_clear_stations_table(priv); | 1474 | priv->cfg->ops->smgmt->clear_station_table(priv); |
1475 | ret = priv->cfg->ops->lib->alive_notify(priv); | 1475 | ret = priv->cfg->ops->lib->alive_notify(priv); |
1476 | if (ret) { | 1476 | if (ret) { |
1477 | IWL_WARN(priv, | 1477 | IWL_WARN(priv, |
@@ -1557,7 +1557,7 @@ static void __iwl_down(struct iwl_priv *priv) | |||
1557 | 1557 | ||
1558 | iwl_leds_unregister(priv); | 1558 | iwl_leds_unregister(priv); |
1559 | 1559 | ||
1560 | iwl_clear_stations_table(priv); | 1560 | priv->cfg->ops->smgmt->clear_station_table(priv); |
1561 | 1561 | ||
1562 | /* Unblock any waiting calls */ | 1562 | /* Unblock any waiting calls */ |
1563 | wake_up_interruptible_all(&priv->wait_command_queue); | 1563 | wake_up_interruptible_all(&priv->wait_command_queue); |
@@ -1708,7 +1708,7 @@ static int __iwl_up(struct iwl_priv *priv) | |||
1708 | 1708 | ||
1709 | for (i = 0; i < MAX_HW_RESTARTS; i++) { | 1709 | for (i = 0; i < MAX_HW_RESTARTS; i++) { |
1710 | 1710 | ||
1711 | iwl_clear_stations_table(priv); | 1711 | priv->cfg->ops->smgmt->clear_station_table(priv); |
1712 | 1712 | ||
1713 | /* load bootstrap state machine, | 1713 | /* load bootstrap state machine, |
1714 | * load bootstrap program into processor's memory, | 1714 | * load bootstrap program into processor's memory, |
@@ -2439,7 +2439,7 @@ static int iwl_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, | |||
2439 | return -EOPNOTSUPP; | 2439 | return -EOPNOTSUPP; |
2440 | } | 2440 | } |
2441 | addr = sta ? sta->addr : iwl_bcast_addr; | 2441 | addr = sta ? sta->addr : iwl_bcast_addr; |
2442 | sta_id = iwl_find_station(priv, addr); | 2442 | sta_id = priv->cfg->ops->smgmt->find_station(priv, addr); |
2443 | if (sta_id == IWL_INVALID_STATION) { | 2443 | if (sta_id == IWL_INVALID_STATION) { |
2444 | IWL_DEBUG_MAC80211(priv, "leave - %pM not in station map.\n", | 2444 | IWL_DEBUG_MAC80211(priv, "leave - %pM not in station map.\n", |
2445 | addr); | 2445 | addr); |
@@ -3311,7 +3311,7 @@ static void __devexit iwl_pci_remove(struct pci_dev *pdev) | |||
3311 | iwl_rx_queue_free(priv, &priv->rxq); | 3311 | iwl_rx_queue_free(priv, &priv->rxq); |
3312 | iwl_hw_txq_ctx_free(priv); | 3312 | iwl_hw_txq_ctx_free(priv); |
3313 | 3313 | ||
3314 | iwl_clear_stations_table(priv); | 3314 | priv->cfg->ops->smgmt->clear_station_table(priv); |
3315 | iwl_eeprom_free(priv); | 3315 | iwl_eeprom_free(priv); |
3316 | 3316 | ||
3317 | 3317 | ||