]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
tg3: Fix return ring size breakage
authorMatt Carlson <mcarlson@broadcom.com>
Fri, 11 Sep 2009 23:50:16 +0000 (16:50 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 11 Sep 2009 23:50:16 +0000 (16:50 -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>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/tg3.c

index 7cf80006eafa680c8255b9fbb7b56f81e0b3b04e..f09bc5dfe8b2c7d652f8d3848ee204d5c2630fba 100644 (file)
  */
 #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)