Skip to content

L
linux-davinci
Commit 06fd3d86 authored by Abhijeet Kolekar's avatar Abhijeet Kolekar Committed by John W. Linville
Browse files
Options

iwl3945/iwlwifi: unify add_station function 

Patch unifies the add_station function for 3945 and iwlwifi drivers.
Signed-off-by: default avatarAbhijeet Kolekar <abhijeet.kolekar@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e11bc028
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 19 deletions
drivers/net/wireless/iwlwifi/iwl-3945-rs.c
View file @ 06fd3d86
...@@ -719,7 +719,7 @@ static void rs_get_rate(void *priv_r, struct ieee80211_sta *sta, ...@@ -719,7 +719,7 @@ static void rs_get_rate(void *priv_r, struct ieee80211_sta *sta,
IWL_DEBUG_RATE(priv, "LQ: ADD station %pm\n", IWL_DEBUG_RATE(priv, "LQ: ADD station %pm\n",
hdr->addr1); hdr->addr1);
sta_id = iwl3945_add_station(priv, sta_id = iwl3945_add_station(priv,
hdr->addr1, 0, CMD_ASYNC); hdr->addr1, 0, CMD_ASYNC, NULL);
} }
if (sta_id != IWL_INVALID_STATION) if (sta_id != IWL_INVALID_STATION)
rs_sta->ibss_sta_added = 1; rs_sta->ibss_sta_added = 1;
......
drivers/net/wireless/iwlwifi/iwl-3945.c
View file @ 06fd3d86
...@@ -2125,7 +2125,7 @@ static int iwl3945_commit_rxon(struct iwl_priv *priv) ...@@ -2125,7 +2125,7 @@ static int iwl3945_commit_rxon(struct iwl_priv *priv)
} }
/* Add the broadcast address so we can send broadcast frames */ /* Add the broadcast address so we can send broadcast frames */
if (priv->cfg->ops->smgmt->add_station(priv, iwl_bcast_addr, 0, 0) == if (priv->cfg->ops->smgmt->add_station(priv, iwl_bcast_addr, 0, 0, NULL) ==
IWL_INVALID_STATION) { IWL_INVALID_STATION) {
IWL_ERR(priv, "Error adding BROADCAST address for transmit.\n"); IWL_ERR(priv, "Error adding BROADCAST address for transmit.\n");
return -EIO; return -EIO;
...@@ -2136,7 +2136,7 @@ static int iwl3945_commit_rxon(struct iwl_priv *priv) ...@@ -2136,7 +2136,7 @@ static int iwl3945_commit_rxon(struct iwl_priv *priv)
if (iwl_is_associated(priv) && if (iwl_is_associated(priv) &&
(priv->iw_mode == NL80211_IFTYPE_STATION)) (priv->iw_mode == NL80211_IFTYPE_STATION))
if (priv->cfg->ops->smgmt->add_station(priv, if (priv->cfg->ops->smgmt->add_station(priv,
priv->active_rxon.bssid_addr, 1, 0) priv->active_rxon.bssid_addr, 1, 0, NULL)
== IWL_INVALID_STATION) { == IWL_INVALID_STATION) {
IWL_ERR(priv, "Error adding AP address for transmit\n"); IWL_ERR(priv, "Error adding AP address for transmit\n");
return -EIO; return -EIO;
......
drivers/net/wireless/iwlwifi/iwl-3945.h
View file @ 06fd3d86
...@@ -206,7 +206,7 @@ struct iwl3945_addsta_cmd; ...@@ -206,7 +206,7 @@ struct iwl3945_addsta_cmd;
extern int iwl3945_send_add_station(struct iwl_priv *priv, extern int iwl3945_send_add_station(struct iwl_priv *priv,
struct iwl3945_addsta_cmd *sta, u8 flags); struct iwl3945_addsta_cmd *sta, u8 flags);
extern u8 iwl3945_add_station(struct iwl_priv *priv, const u8 *bssid, extern u8 iwl3945_add_station(struct iwl_priv *priv, const u8 *bssid,
int is_ap, u8 flags); int is_ap, u8 flags, struct ieee80211_sta_ht_cap *ht_info);
extern void iwl3945_clear_stations_table(struct iwl_priv *priv); extern void iwl3945_clear_stations_table(struct iwl_priv *priv);
extern int iwl3945_power_init_handle(struct iwl_priv *priv); extern int iwl3945_power_init_handle(struct iwl_priv *priv);
extern int iwl3945_eeprom_init(struct iwl_priv *priv); extern int iwl3945_eeprom_init(struct iwl_priv *priv);
......
drivers/net/wireless/iwlwifi/iwl-4965.c
View file @ 06fd3d86
...@@ -2269,7 +2269,7 @@ static void iwl4965_cancel_deferred_work(struct iwl_priv *priv) ...@@ -2269,7 +2269,7 @@ static void iwl4965_cancel_deferred_work(struct iwl_priv *priv)
} }
static struct iwl_station_mgmt_ops iwl4965_station_mgmt = { static struct iwl_station_mgmt_ops iwl4965_station_mgmt = {
.add_station_ht = iwl_add_station_flags, .add_station = iwl_add_station_flags,
.remove_station = iwl_remove_station, .remove_station = iwl_remove_station,
.find_station = iwl_find_station, .find_station = iwl_find_station,
.clear_station_table = iwl_clear_stations_table, .clear_station_table = iwl_clear_stations_table,
......
drivers/net/wireless/iwlwifi/iwl-5000.c
View file @ 06fd3d86
...@@ -1473,7 +1473,7 @@ int iwl5000_calc_rssi(struct iwl_priv *priv, ...@@ -1473,7 +1473,7 @@ int iwl5000_calc_rssi(struct iwl_priv *priv,
} }
struct iwl_station_mgmt_ops iwl5000_station_mgmt = { struct iwl_station_mgmt_ops iwl5000_station_mgmt = {
.add_station_ht = iwl_add_station_flags, .add_station = iwl_add_station_flags,
.remove_station = iwl_remove_station, .remove_station = iwl_remove_station,
.find_station = iwl_find_station, .find_station = iwl_find_station,
.clear_station_table = iwl_clear_stations_table, .clear_station_table = iwl_clear_stations_table,
......
drivers/net/wireless/iwlwifi/iwl-agn-rs.c
View file @ 06fd3d86
...@@ -2459,7 +2459,7 @@ static void rs_get_rate(void *priv_r, struct ieee80211_sta *sta, void *priv_sta, ...@@ -2459,7 +2459,7 @@ static void rs_get_rate(void *priv_r, struct ieee80211_sta *sta, void *priv_sta,
if (sta_id == IWL_INVALID_STATION) { if (sta_id == IWL_INVALID_STATION) {
IWL_DEBUG_RATE(priv, "LQ: ADD station %pM\n", IWL_DEBUG_RATE(priv, "LQ: ADD station %pM\n",
hdr->addr1); hdr->addr1);
sta_id = priv->cfg->ops->smgmt->add_station_ht(priv, sta_id = priv->cfg->ops->smgmt->add_station(priv,
hdr->addr1, 0, hdr->addr1, 0,
CMD_ASYNC, NULL); CMD_ASYNC, NULL);
} }
...@@ -2536,7 +2536,7 @@ static void rs_rate_init(void *priv_r, struct ieee80211_supported_band *sband, ...@@ -2536,7 +2536,7 @@ static void rs_rate_init(void *priv_r, struct ieee80211_supported_band *sband,
if (sta_id == IWL_INVALID_STATION) { if (sta_id == IWL_INVALID_STATION) {
IWL_DEBUG_RATE(priv, "LQ: ADD station %pM\n", sta->addr); IWL_DEBUG_RATE(priv, "LQ: ADD station %pM\n", sta->addr);
sta_id = priv->cfg->ops->smgmt->add_station_ht(priv, sta_id = priv->cfg->ops->smgmt->add_station(priv,
sta->addr, 0, sta->addr, 0,
CMD_ASYNC, NULL); CMD_ASYNC, NULL);
} }
......
drivers/net/wireless/iwlwifi/iwl-core.h
View file @ 06fd3d86
...@@ -84,10 +84,8 @@ struct iwl_cmd; ...@@ -84,10 +84,8 @@ struct iwl_cmd;
#define IWL_SKU_N 0x8 #define IWL_SKU_N 0x8
struct iwl_station_mgmt_ops { struct iwl_station_mgmt_ops {
u8 (*add_station_ht)(struct iwl_priv *priv, const u8 *addr,
int is_ap, u8 flags, struct ieee80211_sta_ht_cap *ht_info);
u8 (*add_station)(struct iwl_priv *priv, const u8 *addr, u8 (*add_station)(struct iwl_priv *priv, const u8 *addr,
int is_ap, u8 flags); int is_ap, u8 flags, struct ieee80211_sta_ht_cap *ht_info);
int (*remove_station)(struct iwl_priv *priv, const u8 *addr, int (*remove_station)(struct iwl_priv *priv, const u8 *addr,
int is_ap); int is_ap);
u8 (*find_station)(struct iwl_priv *priv, const u8 *addr); u8 (*find_station)(struct iwl_priv *priv, const u8 *addr);
......
drivers/net/wireless/iwlwifi/iwl-sta.c
View file @ 06fd3d86
...@@ -1019,7 +1019,7 @@ int iwl_rxon_add_station(struct iwl_priv *priv, const u8 *addr, int is_ap) ...@@ -1019,7 +1019,7 @@ int iwl_rxon_add_station(struct iwl_priv *priv, const u8 *addr, int is_ap)
rcu_read_unlock(); rcu_read_unlock();
} }
sta_id = priv->cfg->ops->smgmt->add_station_ht(priv, addr, is_ap, sta_id = priv->cfg->ops->smgmt->add_station(priv, addr, is_ap,
0, cur_ht_config); 0, cur_ht_config);
/* Set up default rate scaling table in device's station table */ /* Set up default rate scaling table in device's station table */
...@@ -1066,7 +1066,7 @@ int iwl_get_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr) ...@@ -1066,7 +1066,7 @@ int iwl_get_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr)
return sta_id; return sta_id;
/* Create new station table entry */ /* Create new station table entry */
sta_id = priv->cfg->ops->smgmt->add_station_ht(priv, hdr->addr1, sta_id = priv->cfg->ops->smgmt->add_station(priv, hdr->addr1,
0, CMD_ASYNC, NULL); 0, CMD_ASYNC, NULL);
if (sta_id != IWL_INVALID_STATION) if (sta_id != IWL_INVALID_STATION)
......
drivers/net/wireless/iwlwifi/iwl3945-base.c
View file @ 06fd3d86
...@@ -164,7 +164,7 @@ void iwl3945_clear_stations_table(struct iwl_priv *priv) ...@@ -164,7 +164,7 @@ void iwl3945_clear_stations_table(struct iwl_priv *priv)
/** /**
* iwl3945_add_station - Add station to station tables in driver and device * iwl3945_add_station - Add station to station tables in driver and device
*/ */
u8 iwl3945_add_station(struct iwl_priv *priv, const u8 *addr, int is_ap, u8 flags) u8 iwl3945_add_station(struct iwl_priv *priv, const u8 *addr, int is_ap, u8 flags, struct ieee80211_sta_ht_cap *ht_info)
{ {
int i; int i;
int index = IWL_INVALID_STATION; int index = IWL_INVALID_STATION;
...@@ -748,7 +748,7 @@ static int iwl3945_get_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr) ...@@ -748,7 +748,7 @@ static int iwl3945_get_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr)
return sta_id; return sta_id;
sta_id = priv->cfg->ops->smgmt->add_station(priv, sta_id = priv->cfg->ops->smgmt->add_station(priv,
hdr->addr1, 0, CMD_ASYNC); hdr->addr1, 0, CMD_ASYNC, NULL);
if (sta_id != IWL_INVALID_STATION) if (sta_id != IWL_INVALID_STATION)
return sta_id; return sta_id;
...@@ -1884,7 +1884,7 @@ static void iwl3945_error_recovery(struct iwl_priv *priv) ...@@ -1884,7 +1884,7 @@ static void iwl3945_error_recovery(struct iwl_priv *priv)
priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK; priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK;
iwlcore_commit_rxon(priv); iwlcore_commit_rxon(priv);
priv->cfg->ops->smgmt->add_station(priv, priv->bssid, 1, 0); priv->cfg->ops->smgmt->add_station(priv, priv->bssid, 1, 0, NULL);
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->lock, flags);
priv->assoc_id = le16_to_cpu(priv->staging_rxon.assoc_id); priv->assoc_id = le16_to_cpu(priv->staging_rxon.assoc_id);
...@@ -3333,7 +3333,7 @@ void iwl3945_post_associate(struct iwl_priv *priv) ...@@ -3333,7 +3333,7 @@ void iwl3945_post_associate(struct iwl_priv *priv)
case NL80211_IFTYPE_ADHOC: case NL80211_IFTYPE_ADHOC:
priv->assoc_id = 1; priv->assoc_id = 1;
priv->cfg->ops->smgmt->add_station(priv, priv->bssid, 0, 0); priv->cfg->ops->smgmt->add_station(priv, priv->bssid, 0, 0, NULL);
iwl3945_sync_sta(priv, IWL_STA_ID, iwl3945_sync_sta(priv, IWL_STA_ID,
(priv->band == IEEE80211_BAND_5GHZ) ? (priv->band == IEEE80211_BAND_5GHZ) ?
IWL_RATE_6M_PLCP : IWL_RATE_1M_PLCP, IWL_RATE_6M_PLCP : IWL_RATE_1M_PLCP,
...@@ -3661,7 +3661,7 @@ static void iwl3945_config_ap(struct iwl_priv *priv) ...@@ -3661,7 +3661,7 @@ static void iwl3945_config_ap(struct iwl_priv *priv)
/* restore RXON assoc */ /* restore RXON assoc */
priv->staging_rxon.filter_flags |= RXON_FILTER_ASSOC_MSK; priv->staging_rxon.filter_flags |= RXON_FILTER_ASSOC_MSK;
iwlcore_commit_rxon(priv); iwlcore_commit_rxon(priv);
priv->cfg->ops->smgmt->add_station(priv, iwl_bcast_addr, 0, 0); priv->cfg->ops->smgmt->add_station(priv, iwl_bcast_addr, 0, 0, NULL);
} }
iwl3945_send_beacon_cmd(priv); iwl3945_send_beacon_cmd(priv);
...@@ -3754,7 +3754,7 @@ static int iwl3945_mac_config_interface(struct ieee80211_hw *hw, ...@@ -3754,7 +3754,7 @@ static int iwl3945_mac_config_interface(struct ieee80211_hw *hw,
rc = iwlcore_commit_rxon(priv); rc = iwlcore_commit_rxon(priv);
if ((priv->iw_mode == NL80211_IFTYPE_STATION) && rc) if ((priv->iw_mode == NL80211_IFTYPE_STATION) && rc)
priv->cfg->ops->smgmt->add_station(priv, priv->cfg->ops->smgmt->add_station(priv,
priv->active_rxon.bssid_addr, 1, 0); priv->active_rxon.bssid_addr, 1, 0, NULL);
} }
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment