From: Matt Carlson Date: Mon, 12 Apr 2010 06:58:29 +0000 (+0000) Subject: tg3: Unify max pkt size preprocessor constants X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=04380d401ebd02ec68bb0fc170f21a93690ebc80;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git tg3: Unify max pkt size preprocessor constants The maximum packet size that gets programmed into the standard producer ring control block is directly related to the packet size used to allocate packet buffers. This patch removes the redundant preprocessor constant. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller --- diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 3263f50bc52e..a331ec51ebc2 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -7905,9 +7905,9 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy) if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 || GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765) val = (RX_STD_MAX_SIZE_5705 << BDINFO_FLAGS_MAXLEN_SHIFT) | - (RX_STD_MAX_SIZE << 2); + (TG3_RX_STD_DMA_SZ << 2); else - val = RX_STD_MAX_SIZE << BDINFO_FLAGS_MAXLEN_SHIFT; + val = TG3_RX_STD_DMA_SZ << BDINFO_FLAGS_MAXLEN_SHIFT; } else val = RX_STD_MAX_SIZE_5705 << BDINFO_FLAGS_MAXLEN_SHIFT; diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h index 43dd1d26243c..b71083d9a118 100644 --- a/drivers/net/tg3.h +++ b/drivers/net/tg3.h @@ -25,7 +25,6 @@ #define TG3_RX_INTERNAL_RING_SZ_5906 32 -#define RX_STD_MAX_SIZE 1536 #define RX_STD_MAX_SIZE_5705 512 #define RX_JUMBO_MAX_SIZE 0xdeadbeef /* XXX */