aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl3945-base.c
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2007-10-25 05:15:27 -0400
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:03:11 -0500
commit6994633357d3406dcd14e11d6ee61073b2251b72 (patch)
treebc000261296c13dff1b4856dee2ae7dd512c06e8 /drivers/net/wireless/iwlwifi/iwl3945-base.c
parentf1f1f5c730a3598b36989c63d387d9cab63161c7 (diff)
iwlwifi: remove cck_flag from iwl_driver_hw_info
This patch remove cck_flag from iwl_driver_hw_info, this flag is unused after spliting the iwl-base.c Signed-off-by: Tomas Winkler <tomas.winkler@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.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index f6022649a6b7..125d99e9476e 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -506,8 +506,10 @@ u8 iwl_add_station(struct iwl_priv *priv, const u8 *addr, int is_ap, u8 flags)
506 station->sta.sta.sta_id = index; 506 station->sta.sta.sta_id = index;
507 station->sta.station_flags = 0; 507 station->sta.station_flags = 0;
508 508
509 rate = (priv->phymode == MODE_IEEE80211A) ? IWL_RATE_6M_PLCP : 509 if (priv->phymode == MODE_IEEE80211A)
510 IWL_RATE_1M_PLCP | priv->hw_setting.cck_flag; 510 rate = IWL_RATE_6M_PLCP;
511 else
512 rate = IWL_RATE_1M_PLCP;
511 513
512 /* Turn on both antennas for the station... */ 514 /* Turn on both antennas for the station... */
513 station->sta.rate_n_flags = 515 station->sta.rate_n_flags =