From af6b878127bcceb3e961f6ba27dbebf78b1839f9 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Wed, 4 Feb 2009 16:52:41 -0800
Subject: [PATCH] --- yaml --- r: 134296 b: refs/heads/master c:
 7870389478d3c682c79c07abe7f1fce8b8a81952 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 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b30266260c41..57f9bfc73974 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 005c79b3d4df48fa01b77e5ccf46e5cd4754cfd5
+refs/heads/master: 7870389478d3c682c79c07abe7f1fce8b8a81952
diff --git a/trunk/drivers/net/cxgb3/sge.c b/trunk/drivers/net/cxgb3/sge.c
index 272a0168f3e9..8205aa4ae945 100644
--- a/trunk/drivers/net/cxgb3/sge.c
+++ b/trunk/drivers/net/cxgb3/sge.c
@@ -2201,8 +2201,7 @@ static int process_responses(struct adapter *adap, struct sge_qset *qs,
 		} else if ((len = ntohl(r->len_cq)) != 0) {
 			struct sge_fl *fl;
 
-			if (eth)
-				lro = qs->lro_enabled && is_eth_tcp(rss_hi);
+			lro &= eth && 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 dadd08cd801b..802a9516ce41 100644
--- a/trunk/drivers/net/gianfar.c
+++ b/trunk/drivers/net/gianfar.c
@@ -372,6 +372,9 @@ 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 811855bc4231..54332b0059df 100644
--- a/trunk/drivers/net/gianfar.h
+++ b/trunk/drivers/net/gianfar.h
@@ -314,7 +314,7 @@ extern const char gfar_driver_version[];
 #define ATTRELI_EI(x) (x)
 
 #define BD_LFLAG(flags) ((flags) << 16)
-#define BD_LENGTH_MASK		0x00ff
+#define BD_LENGTH_MASK		0x0000ffff
 
 /* TxBD status field bits */
 #define TXBD_READY		0x8000