Patchwork tg3: Fix return ring size breakage

login
register
mail settings
Submitter Matt Carlson
Date Sept. 11, 2009, 11:23 p.m.
Message ID <1252711336.12629@xw6200>
Download mbox | patch
Permalink /patch/33515/
State Accepted
Delegated to: David Miller
Headers show

Comments

Matt Carlson - Sept. 11, 2009, 11:23 p.m.
Commit f6eb9b1fc1411d22c073f5264e5630a541d0f7df, "tg3: Add 5717 asic
rev" changed how the rx return ring size operations are done.  It
effectively inverts the sense of the previous test, but it failed to
also invert the resulting sizes.  This patch corrects that error.

Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
---
 drivers/net/tg3.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
David Miller - Sept. 11, 2009, 11:57 p.m.
From: mcarlson <mcarlson@broadcom.com>
Date: Fri, 11 Sep 2009 16:23:19 -0700

> Commit f6eb9b1fc1411d22c073f5264e5630a541d0f7df, "tg3: Add 5717 asic
> rev" changed how the rx return ring size operations are done.  It
> effectively inverts the sense of the previous test, but it failed to
> also invert the resulting sizes.  This patch corrects that error.
> 
> Signed-off-by: Matt Carlson <mcarlson@broadcom.com>

Confirmed to fix things here, applied, thanks!
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 7cf8000..f09bc5d 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -112,7 +112,7 @@ 
  */
 #define TG3_RX_RCB_RING_SIZE(tp)	\
 	(((tp->tg3_flags & TG3_FLAG_JUMBO_CAPABLE) && \
-	  !(tp->tg3_flags2 & TG3_FLG2_5780_CLASS)) ? 512 : 1024)
+	  !(tp->tg3_flags2 & TG3_FLG2_5780_CLASS)) ? 1024 : 512)
 
 #define TG3_TX_RING_SIZE		512
 #define TG3_DEF_TX_RING_PENDING		(TG3_TX_RING_SIZE - 1)