From 43b9441f744e267168e0744644dd761b53369adb Mon Sep 17 00:00:00 2001
From: Reinette Chatre <reinette.chatre@intel.com>
Date: Wed, 28 Jan 2009 09:38:30 -0800
Subject: [PATCH] --- yaml --- r: 130988 b: refs/heads/master c:
 5e46882e2ecacd2ebd1bfba3caaa4a25ffbcb94d h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/net/cxgb3/sge.c                | 3 ++-
 trunk/drivers/net/gianfar.c                  | 3 ---
 trunk/drivers/net/gianfar.h                  | 2 +-
 trunk/drivers/net/wireless/iwlwifi/iwl-sta.c | 3 +++
 trunk/net/ipv4/udp.c                         | 3 +--
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index ef95152910a0..974a58eb5018 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b5e56f9d635643ad54f2f42e69ad16b80a2cff1
+refs/heads/master: 5e46882e2ecacd2ebd1bfba3caaa4a25ffbcb94d
diff --git a/trunk/drivers/net/cxgb3/sge.c b/trunk/drivers/net/cxgb3/sge.c
index d31791f60292..379a1324db4e 100644
--- a/trunk/drivers/net/cxgb3/sge.c
+++ b/trunk/drivers/net/cxgb3/sge.c
@@ -2276,7 +2276,8 @@ static int process_responses(struct adapter *adap, struct sge_qset *qs,
 		} else if ((len = ntohl(r->len_cq)) != 0) {
 			struct sge_fl *fl;
 
-			lro &= eth && is_eth_tcp(rss_hi);
+			if (eth)
+				lro = qs->lro_enabled && is_eth_tcp(rss_hi);
 
 			fl = (len & F_RSPD_FLQ) ? &qs->fl[1] : &qs->fl[0];
 			if (fl->use_pages) {
diff --git a/trunk/drivers/net/gianfar.c b/trunk/drivers/net/gianfar.c
index acae2d8cd688..3f7eab42aef1 100644
--- a/trunk/drivers/net/gianfar.c
+++ b/trunk/drivers/net/gianfar.c
@@ -351,9 +351,6 @@ static int gfar_probe(struct of_device *ofdev,
 	/* Reset MAC layer */
 	gfar_write(&priv->regs->maccfg1, MACCFG1_SOFT_RESET);
 
-	/* We need to delay at least 3 TX clocks */
-	udelay(2);
-
 	tempval = (MACCFG1_TX_FLOW | MACCFG1_RX_FLOW);
 	gfar_write(&priv->regs->maccfg1, tempval);
 
diff --git a/trunk/drivers/net/gianfar.h b/trunk/drivers/net/gianfar.h
index eaa86897f5c3..b1a83344acc7 100644
--- a/trunk/drivers/net/gianfar.h
+++ b/trunk/drivers/net/gianfar.h
@@ -312,7 +312,7 @@ extern const char gfar_driver_version[];
 #define ATTRELI_EI(x) (x)
 
 #define BD_LFLAG(flags) ((flags) << 16)
-#define BD_LENGTH_MASK		0x0000ffff
+#define BD_LENGTH_MASK		0x00ff
 
 /* TxBD status field bits */
 #define TXBD_READY		0x8000
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-sta.c b/trunk/drivers/net/wireless/iwlwifi/iwl-sta.c
index 412f66bac1af..70a8b21ca39b 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-sta.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-sta.c
@@ -480,6 +480,9 @@ void iwl_clear_stations_table(struct iwl_priv *priv)
 	priv->num_stations = 0;
 	memset(priv->stations, 0, sizeof(priv->stations));
 
+	/* clean ucode key table bit map */
+	priv->ucode_key_table = 0;
+
 	spin_unlock_irqrestore(&priv->sta_lock, flags);
 }
 EXPORT_SYMBOL(iwl_clear_stations_table);
diff --git a/trunk/net/ipv4/udp.c b/trunk/net/ipv4/udp.c
index cc3a0a06c004..1ab180bad72a 100644
--- a/trunk/net/ipv4/udp.c
+++ b/trunk/net/ipv4/udp.c
@@ -1231,7 +1231,7 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
 		   int proto)
 {
 	struct sock *sk;
-	struct udphdr *uh;
+	struct udphdr *uh = udp_hdr(skb);
 	unsigned short ulen;
 	struct rtable *rt = (struct rtable*)skb->dst;
 	__be32 saddr = ip_hdr(skb)->saddr;
@@ -1244,7 +1244,6 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
 	if (!pskb_may_pull(skb, sizeof(struct udphdr)))
 		goto drop;		/* No space for header. */
 
-	uh   = udp_hdr(skb);
 	ulen = ntohs(uh->len);
 	if (ulen > skb->len)
 		goto short_packet;