hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

iwlwifi: move iwl_bcast_addr to iwlcore 

This patch renames iwl4965_broadcast_addr to iwl_bcast_addr
and moves it to iwlcore.

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Tomas Winkler 2008-05-15 13:54:03 +08:00 committed by John W. Linville
parent 1826dcc094
commit 57bd1bea48
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/iwlwifi/iwl-4965.c
View File

@ -2029,7 +2029,7 @@ unsigned int iwl4965_hw_get_beacon_cmd(struct iwl_priv *priv,
frame_size = iwl4965_fill_beacon_frame(priv, frame_size = iwl4965_fill_beacon_frame(priv,
tx_beacon_cmd->frame, tx_beacon_cmd->frame,
iwl4965_broadcast_addr, iwl_bcast_addr,
sizeof(frame->u) - sizeof(*tx_beacon_cmd)); sizeof(frame->u) - sizeof(*tx_beacon_cmd));
BUG_ON(frame_size > MAX_MPDU_SIZE); BUG_ON(frame_size > MAX_MPDU_SIZE);

5
drivers/net/wireless/iwlwifi/iwl-core.c
View File

@ -85,6 +85,11 @@ const struct iwl_rate_info iwl_rates[IWL_RATE_COUNT] = {
}; };
EXPORT_SYMBOL(iwl_rates); EXPORT_SYMBOL(iwl_rates);
const u8 iwl_bcast_addr[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
EXPORT_SYMBOL(iwl_bcast_addr);
/* This function both allocates and initializes hw and priv. */ /* This function both allocates and initializes hw and priv. */
struct ieee80211_hw *iwl_alloc_all(struct iwl_cfg *cfg, struct ieee80211_hw *iwl_alloc_all(struct iwl_cfg *cfg,
struct ieee80211_ops *hw_ops) struct ieee80211_ops *hw_ops)

2
drivers/net/wireless/iwlwifi/iwl-dev.h
View File

@ -659,7 +659,7 @@ int iwl4965_set_pwr_src(struct iwl_priv *priv, enum iwl_pwr_src src);
int iwl4965_init_geos(struct iwl_priv *priv); int iwl4965_init_geos(struct iwl_priv *priv);
void iwl4965_free_geos(struct iwl_priv *priv); void iwl4965_free_geos(struct iwl_priv *priv);
extern const u8 iwl4965_broadcast_addr[ETH_ALEN]; extern const u8 iwl_bcast_addr[ETH_ALEN];
int iwl4965_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd); int iwl4965_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd);
/* /*

11
drivers/net/wireless/iwlwifi/iwl4965-base.c
View File

@ -207,7 +207,6 @@ static inline u8 get_cmd_index(struct iwl_queue *q, u32 index, int is_huge)
return index & (q->n_window - 1); return index & (q->n_window - 1);
} }
const u8 iwl4965_broadcast_addr[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
/*************** STATION TABLE MANAGEMENT **** /*************** STATION TABLE MANAGEMENT ****
* mac80211 should be examined to determine if sta_info is duplicating * mac80211 should be examined to determine if sta_info is duplicating
@ -692,7 +691,7 @@ static int iwl4965_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 (iwl4965_rxon_add_station(priv, iwl4965_broadcast_addr, 0) == if (iwl4965_rxon_add_station(priv, iwl_bcast_addr, 0) ==
IWL_INVALID_STATION) { IWL_INVALID_STATION) {
IWL_ERROR("Error adding BROADCAST address for transmit.\n"); IWL_ERROR("Error adding BROADCAST address for transmit.\n");
return -EIO; return -EIO;
@ -1059,9 +1058,9 @@ static u16 iwl4965_fill_probe_req(struct iwl_priv *priv,
len += 24; len += 24;
frame->frame_control = cpu_to_le16(IEEE80211_STYPE_PROBE_REQ); frame->frame_control = cpu_to_le16(IEEE80211_STYPE_PROBE_REQ);
memcpy(frame->da, iwl4965_broadcast_addr, ETH_ALEN); memcpy(frame->da, iwl_bcast_addr, ETH_ALEN);
memcpy(frame->sa, priv->mac_addr, ETH_ALEN); memcpy(frame->sa, priv->mac_addr, ETH_ALEN);
memcpy(frame->bssid, iwl4965_broadcast_addr, ETH_ALEN); memcpy(frame->bssid, iwl_bcast_addr, ETH_ALEN);
frame->seq_ctrl = 0; frame->seq_ctrl = 0;
/* fill in our indirect SSID IE */ /* fill in our indirect SSID IE */
@ -4912,7 +4911,7 @@ static void iwl4965_post_associate(struct iwl_priv *priv)
/* clear out the station table */ /* clear out the station table */
iwlcore_clear_stations_table(priv); iwlcore_clear_stations_table(priv);
iwl4965_rxon_add_station(priv, iwl4965_broadcast_addr, 0); iwl4965_rxon_add_station(priv, iwl_bcast_addr, 0);
iwl4965_rxon_add_station(priv, priv->bssid, 0); iwl4965_rxon_add_station(priv, priv->bssid, 0);
iwl4965_rate_scale_init(priv->hw, IWL_STA_ID); iwl4965_rate_scale_init(priv->hw, IWL_STA_ID);
iwl4965_send_beacon_cmd(priv); iwl4965_send_beacon_cmd(priv);
@ -5324,7 +5323,7 @@ static void iwl4965_config_ap(struct iwl_priv *priv)
priv->staging_rxon.filter_flags |= RXON_FILTER_ASSOC_MSK; priv->staging_rxon.filter_flags |= RXON_FILTER_ASSOC_MSK;
iwl4965_commit_rxon(priv); iwl4965_commit_rxon(priv);
iwl4965_activate_qos(priv, 1); iwl4965_activate_qos(priv, 1);
iwl4965_rxon_add_station(priv, iwl4965_broadcast_addr, 0); iwl4965_rxon_add_station(priv, iwl_bcast_addr, 0);
} }
iwl4965_send_beacon_cmd(priv); iwl4965_send_beacon_cmd(priv);