From 5e1038ef9becceb512548f5d0141c6dbf1524330 Mon Sep 17 00:00:00 2001 From: Zhu Yi Date: Tue, 6 Nov 2007 22:06:27 -0800 Subject: [PATCH] --- yaml --- r: 78991 b: refs/heads/master c: 4900d6daadea8b32b8a6312e793977e18343cfe5 h: refs/heads/master i: 78989: b67755515ee9fedf7407b3eb7e12df047b997835 78987: 9d16bb5a052a2b08d41b8e5f5a91c4b919aa74b8 78983: b4dfac849ec5c0c7e1e624a6782d8c819d815230 78975: f2ca8f33b73ad7526d4b9960358c148247d744d7 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-4965.c | 8 -------- trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c | 2 -- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 57958a4e8422..cdb777675495 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bb8c093bdea62f2ae371b98ebff81b0407852faf +refs/heads/master: 4900d6daadea8b32b8a6312e793977e18343cfe5 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-4965.c b/trunk/drivers/net/wireless/iwlwifi/iwl-4965.c index f7c5ac3072c7..9b8560d3315a 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-4965.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-4965.c @@ -4269,14 +4269,6 @@ static int iwl4965_tx_queue_agg_disable(struct iwl4965_priv *priv, u16 txq_id, #endif/* CONFIG_IWL4965_HT_AGG */ #endif /* CONFIG_IWL4965_HT */ -/* - * RATE SCALE CODE - */ -int iwl4965_init_hw_rates(struct iwl4965_priv *priv, struct ieee80211_rate *rates) -{ - return 0; -} - /** * iwl4965_add_station - Initialize a station's hardware rate table diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c b/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c index 41cabd618496..7d0b7c994d98 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c @@ -5633,8 +5633,6 @@ static void iwl4965_init_hw_rates(struct iwl4965_priv *priv, if (IWL_BASIC_RATES_MASK & (1 << i)) rates[i].flags |= IEEE80211_RATE_BASIC; } - - iwl4965_init_hw_rates(priv, rates); } /**