---

yaml --- r: 111175 b: refs/heads/master c: 39351fa h: refs/heads/master i: 111173: 785cc37 111171: 9779fe0 111167: 86471e5 v: v3
git-mirror · Aug 22, 2008 · 68e390e · 68e390e
1 parent a7fc146
commit 68e390e
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 17 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 73ae98a1334c7ab7c4f01e8a1c0c773470979688
+refs/heads/master: 39351fa343289070f6f30bd0652e10c8d97f0a3b
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-core.c b/trunk/drivers/net/wireless/iwlwifi/iwl-core.c
@@ -876,7 +876,6 @@ int iwl_init_drv(struct iwl_priv *priv)
 	spin_lock_init(&priv->power_data.lock);
 	spin_lock_init(&priv->sta_lock);
 	spin_lock_init(&priv->hcmd_lock);
-	spin_lock_init(&priv->lq_mngr.lock);
 
 	INIT_LIST_HEAD(&priv->free_frames);
 

diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-dev.h b/trunk/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -672,18 +672,6 @@ struct iwl_kw {
 
 #define TX_POWER_IWL_ILLEGAL_VOLTAGE -10000
 
-struct iwl4965_lq_mngr {
-	spinlock_t lock;
-	s32 max_window_size;
-	s32 *expected_tpt;
-	u8 *next_higher_rate;
-	u8 *next_lower_rate;
-	unsigned long stamp;
-	unsigned long stamp_last;
-	u32 flush_time;
-	u32 tx_packets;
-};
-
 /* Sensitivity and chain noise calibration */
 #define INTERFERENCE_DATA_AVAILABLE	__constant_cpu_to_le32(1)
 #define INITIALIZATION_VALUE		0xFFFF
@@ -938,9 +926,6 @@ struct iwl_priv {
 	struct iwl_ht_info current_ht_config;
 	u8 last_phy_res[100];
 
-	/* Rate scaling data */
-	struct iwl4965_lq_mngr lq_mngr;
-
 	/* Rate scaling data */
 	s8 data_retry_limit;
 	u8 retry_rate;