diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-sta.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-sta.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c index bc90a12408a..c2151564007 100644 --- a/drivers/net/wireless/iwlwifi/iwl-sta.c +++ b/drivers/net/wireless/iwlwifi/iwl-sta.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /****************************************************************************** | 1 | /****************************************************************************** |
2 | * | 2 | * |
3 | * Copyright(c) 2003 - 2010 Intel Corporation. All rights reserved. | 3 | * Copyright(c) 2003 - 2011 Intel Corporation. All rights reserved. |
4 | * | 4 | * |
5 | * Portions of this file are derived from the ipw3945 project, as well | 5 | * Portions of this file are derived from the ipw3945 project, as well |
6 | * as portions of the ieee80211 subsystem header files. | 6 | * as portions of the ieee80211 subsystem header files. |
@@ -233,7 +233,6 @@ u8 iwl_prep_station(struct iwl_priv *priv, struct iwl_rxon_context *ctx, | |||
233 | struct iwl_station_entry *station; | 233 | struct iwl_station_entry *station; |
234 | int i; | 234 | int i; |
235 | u8 sta_id = IWL_INVALID_STATION; | 235 | u8 sta_id = IWL_INVALID_STATION; |
236 | u16 rate; | ||
237 | 236 | ||
238 | if (is_ap) | 237 | if (is_ap) |
239 | sta_id = ctx->ap_sta_id; | 238 | sta_id = ctx->ap_sta_id; |
@@ -306,12 +305,6 @@ u8 iwl_prep_station(struct iwl_priv *priv, struct iwl_rxon_context *ctx, | |||
306 | */ | 305 | */ |
307 | iwl_set_ht_add_station(priv, sta_id, sta, ctx); | 306 | iwl_set_ht_add_station(priv, sta_id, sta, ctx); |
308 | 307 | ||
309 | /* 3945 only */ | ||
310 | rate = (priv->band == IEEE80211_BAND_5GHZ) ? | ||
311 | IWL_RATE_6M_PLCP : IWL_RATE_1M_PLCP; | ||
312 | /* Turn on both antennas for the station... */ | ||
313 | station->sta.rate_n_flags = cpu_to_le16(rate | RATE_MCS_ANT_AB_MSK); | ||
314 | |||
315 | return sta_id; | 308 | return sta_id; |
316 | 309 | ||
317 | } | 310 | } |