aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl3945-base.c
diff options
context:
space:
mode:
authorKolekar, Abhijeet <abhijeet.kolekar@intel.com>2008-12-18 21:37:22 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-01-29 15:59:07 -0500
commitb5323d36637909481318e7dfcba9f3e3b9368881 (patch)
tree550c89e585b748f074207c8fa7bc8bc7cf0204f2 /drivers/net/wireless/iwlwifi/iwl3945-base.c
parenta78fe754e0e5a77ca968ee0c348f027e84659d8b (diff)
iwl3945: replace iwl3945_broadcast_addr with iwl_bcast_addr
The patch replaces iwl3945_broadcast_addr with iwl_bcast_addr for 3945. Signed-off-by: Abhijeet Kolekar <abhijeet.kolekar@intel.com> Signed-off-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl3945-base.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl3945-base.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 313826da45ca..6fb5d07ec6b9 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -303,8 +303,6 @@ void iwl3945_tx_queue_free(struct iwl3945_priv *priv, struct iwl3945_tx_queue *t
303 memset(txq, 0, sizeof(*txq)); 303 memset(txq, 0, sizeof(*txq));
304} 304}
305 305
306const u8 iwl3945_broadcast_addr[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
307
308/*************** STATION TABLE MANAGEMENT **** 306/*************** STATION TABLE MANAGEMENT ****
309 * mac80211 should be examined to determine if sta_info is duplicating 307 * mac80211 should be examined to determine if sta_info is duplicating
310 * the functionality provided here 308 * the functionality provided here
@@ -1032,7 +1030,7 @@ static int iwl3945_commit_rxon(struct iwl3945_priv *priv)
1032 } 1030 }
1033 1031
1034 /* Add the broadcast address so we can send broadcast frames */ 1032 /* Add the broadcast address so we can send broadcast frames */
1035 if (iwl3945_add_station(priv, iwl3945_broadcast_addr, 0, 0) == 1033 if (iwl3945_add_station(priv, iwl_bcast_addr, 0, 0) ==
1036 IWL_INVALID_STATION) { 1034 IWL_INVALID_STATION) {
1037 IWL_ERROR("Error adding BROADCAST address for transmit.\n"); 1035 IWL_ERROR("Error adding BROADCAST address for transmit.\n");
1038 return -EIO; 1036 return -EIO;
@@ -1529,9 +1527,9 @@ static u16 iwl3945_fill_probe_req(struct iwl3945_priv *priv,
1529 len += 24; 1527 len += 24;
1530 1528
1531 frame->frame_control = cpu_to_le16(IEEE80211_STYPE_PROBE_REQ); 1529 frame->frame_control = cpu_to_le16(IEEE80211_STYPE_PROBE_REQ);
1532 memcpy(frame->da, iwl3945_broadcast_addr, ETH_ALEN); 1530 memcpy(frame->da, iwl_bcast_addr, ETH_ALEN);
1533 memcpy(frame->sa, priv->mac_addr, ETH_ALEN); 1531 memcpy(frame->sa, priv->mac_addr, ETH_ALEN);
1534 memcpy(frame->bssid, iwl3945_broadcast_addr, ETH_ALEN); 1532 memcpy(frame->bssid, iwl_bcast_addr, ETH_ALEN);
1535 frame->seq_ctrl = 0; 1533 frame->seq_ctrl = 0;
1536 1534
1537 /* fill in our indirect SSID IE */ 1535 /* fill in our indirect SSID IE */
@@ -6640,7 +6638,7 @@ static void iwl3945_config_ap(struct iwl3945_priv *priv)
6640 /* restore RXON assoc */ 6638 /* restore RXON assoc */
6641 priv->staging_rxon.filter_flags |= RXON_FILTER_ASSOC_MSK; 6639 priv->staging_rxon.filter_flags |= RXON_FILTER_ASSOC_MSK;
6642 iwl3945_commit_rxon(priv); 6640 iwl3945_commit_rxon(priv);
6643 iwl3945_add_station(priv, iwl3945_broadcast_addr, 0, 0); 6641 iwl3945_add_station(priv, iwl_bcast_addr, 0, 0);
6644 } 6642 }
6645 iwl3945_send_beacon_cmd(priv); 6643 iwl3945_send_beacon_cmd(priv);
6646 6644