aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2010-04-30 14:30:49 -0400
committerReinette Chatre <reinette.chatre@intel.com>2010-05-10 18:09:07 -0400
commit57f8db89340f6ba5d913a1950b8dad4431d2beda (patch)
tree5a22b6173ae8b507be6f6e2f64441f75cfd5aacd
parentc1182743b688bce7b0bbd7cff78b049e45672cb5 (diff)
iwlwifi: rename iwl_add_local_station
This function is now only used for the special IBSS BSSID station, so rename it to indicate this. The new name is iwl_add_bssid_station. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-3945.c2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn-lib.c2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-sta.c9
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-sta.h2
4 files changed, 6 insertions, 9 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
index 306e23aee1ed..0eb0faa9d3cf 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@ -2465,7 +2465,7 @@ static int iwl3945_manage_ibss_station(struct iwl_priv *priv,
2465 int ret; 2465 int ret;
2466 2466
2467 if (add) { 2467 if (add) {
2468 ret = iwl_add_local_station(priv, vif->bss_conf.bssid, false, 2468 ret = iwl_add_bssid_station(priv, vif->bss_conf.bssid, false,
2469 &vif_priv->ibss_bssid_sta_id); 2469 &vif_priv->ibss_bssid_sta_id);
2470 if (ret) 2470 if (ret)
2471 return ret; 2471 return ret;
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
index 81de88ef745e..637d7b62fb56 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-lib.c
@@ -1523,7 +1523,7 @@ int iwlagn_manage_ibss_station(struct iwl_priv *priv,
1523 struct iwl_vif_priv *vif_priv = (void *)vif->drv_priv; 1523 struct iwl_vif_priv *vif_priv = (void *)vif->drv_priv;
1524 1524
1525 if (add) 1525 if (add)
1526 return iwl_add_local_station(priv, vif->bss_conf.bssid, true, 1526 return iwl_add_bssid_station(priv, vif->bss_conf.bssid, true,
1527 &vif_priv->ibss_bssid_sta_id); 1527 &vif_priv->ibss_bssid_sta_id);
1528 return iwl_remove_station(priv, vif_priv->ibss_bssid_sta_id, 1528 return iwl_remove_station(priv, vif_priv->ibss_bssid_sta_id,
1529 vif->bss_conf.bssid); 1529 vif->bss_conf.bssid);
diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c
index ba36df5e2c78..c15098ed0416 100644
--- a/drivers/net/wireless/iwlwifi/iwl-sta.c
+++ b/drivers/net/wireless/iwlwifi/iwl-sta.c
@@ -417,14 +417,11 @@ static struct iwl_link_quality_cmd *iwl_sta_alloc_lq(struct iwl_priv *priv,
417} 417}
418 418
419/* 419/*
420 * iwl_add_local_station - Add stations not requested by mac80211 420 * iwl_add_bssid_station - Add the special IBSS BSSID station
421 *
422 * This will be either the broadcast station or the bssid station needed by
423 * ad-hoc.
424 * 421 *
425 * Function sleeps. 422 * Function sleeps.
426 */ 423 */
427int iwl_add_local_station(struct iwl_priv *priv, const u8 *addr, bool init_rs, 424int iwl_add_bssid_station(struct iwl_priv *priv, const u8 *addr, bool init_rs,
428 u8 *sta_id_r) 425 u8 *sta_id_r)
429{ 426{
430 int ret; 427 int ret;
@@ -468,7 +465,7 @@ int iwl_add_local_station(struct iwl_priv *priv, const u8 *addr, bool init_rs,
468 465
469 return 0; 466 return 0;
470} 467}
471EXPORT_SYMBOL(iwl_add_local_station); 468EXPORT_SYMBOL(iwl_add_bssid_station);
472 469
473/** 470/**
474 * iwl_sta_ucode_deactivate - deactivate ucode status for a station 471 * iwl_sta_ucode_deactivate - deactivate ucode status for a station
diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.h b/drivers/net/wireless/iwlwifi/iwl-sta.h
index 6872bcfe7de1..64271487daa7 100644
--- a/drivers/net/wireless/iwlwifi/iwl-sta.h
+++ b/drivers/net/wireless/iwlwifi/iwl-sta.h
@@ -63,7 +63,7 @@ void iwl_dealloc_bcast_station(struct iwl_priv *priv);
63int iwl_get_free_ucode_key_index(struct iwl_priv *priv); 63int iwl_get_free_ucode_key_index(struct iwl_priv *priv);
64int iwl_send_add_sta(struct iwl_priv *priv, 64int iwl_send_add_sta(struct iwl_priv *priv,
65 struct iwl_addsta_cmd *sta, u8 flags); 65 struct iwl_addsta_cmd *sta, u8 flags);
66int iwl_add_local_station(struct iwl_priv *priv, const u8 *addr, bool init_rs, 66int iwl_add_bssid_station(struct iwl_priv *priv, const u8 *addr, bool init_rs,
67 u8 *sta_id_r); 67 u8 *sta_id_r);
68int iwl_add_station_common(struct iwl_priv *priv, const u8 *addr, 68int iwl_add_station_common(struct iwl_priv *priv, const u8 *addr,
69 bool is_ap, 69 bool is_ap,