Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04380d40 authored by Matt Carlson's avatar Matt Carlson Committed by David S. Miller
Browse files

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: default avatarMatt Carlson <mcarlson@broadcom.com>
Reviewed-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9dc7a113

drivers/net/tg3.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/net/tg3.h

+0 −1
Original line number Diff line number Diff line
@@ -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 */