From 92f68c867594e002f929612d19686008a5ab4c9e Mon Sep 17 00:00:00 2001
From: Zhu Yi <yi.zhu@intel.com>
Date: Thu, 13 Apr 2006 17:21:06 +0800
Subject: [PATCH] --- yaml --- r: 27300 b: refs/heads/master c:
 127119d50ff6e226c602ae920722897f8a0c81e2 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/wireless/ipw2200.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 9b38879f61e9..0b5343e70319 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 459d408768fecfd1c2d170ab073e8cfd48326b1f
+refs/heads/master: 127119d50ff6e226c602ae920722897f8a0c81e2
diff --git a/trunk/drivers/net/wireless/ipw2200.c b/trunk/drivers/net/wireless/ipw2200.c
index 8a475c7e4add..0f81ff7a1cd6 100644
--- a/trunk/drivers/net/wireless/ipw2200.c
+++ b/trunk/drivers/net/wireless/ipw2200.c
@@ -7790,9 +7790,6 @@ static void ipw_handle_promiscuous_rx(struct ipw_priv *priv,
 	if (filter & IPW_PROM_NO_RX)
 		return;
 
-	if (!noise)
-		noise = priv->last_noise;
-
 	/* We received data from the HW, so stop the watchdog */
 	priv->prom_net_dev->trans_start = jiffies;