[net-next 10/12] ixgbe: Drop unnecessary addition from ixgbe_set_rx_buffer_len
flat view
STALE5108d
SUPERSEDED: 1 (0M)
From: Jeff Kirsher <hidden>
Date: 2012-10-23 04:26:32
Subsystem:
intel ethernet drivers, networking drivers, the rest · Maintainers:
Tony Nguyen, Przemek Kitszel, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Revision v1 of 113 in this series; 1 review trailer.
Revisions (113)
- v1
- v2 [diff vs current]
- v1
- v1
- v1
- v1
- v1
- v1
- v1
- v1
- v3 [diff vs current]
- v1
- v1
- v2 [diff vs current]
- v2 [diff vs current]
- v1
- v1
- v1
- v1
- v1
- v1
- v1
- v1
- v1
- v1
- v1
- v1
- v1
- v1
- v1
- v1
- v1
- v1 current
- v1
- v2 [diff vs current]
- v1
- v1
- v1
- v1
- v2 [diff vs current]
- v1
- v2 [diff vs current]
- v1
- v1
- v1
- v1
- v1
- v1
- v1
- v1
- v1
- v1
- v2 [diff vs current]
- v1
- v1
- v1
- v1
- v2 [diff vs current]
- v1
- v2 [diff vs current]
- v1
- v2 [diff vs current]
- v1
- v1
- v2 [diff vs current]
- v1
- v1
- v1
- v1
- v1
- v1
- v2 [diff vs current]
- v1
- v1
- v2 [diff vs current]
- v3 [diff vs current]
- v4 [diff vs current]
- v2 [diff vs current]
- v5 [diff vs current]
- v1
- v1
- v1
- v2 [diff vs current]
- v1
- v1
- v2 [diff vs current]
- v3 [diff vs current]
- v1
- v2 [diff vs current]
- v1
- v1
- v2 [diff vs current]
- v1
- v2 [diff vs current]
- v1
- v2 [diff vs current]
- v3 [diff vs current]
- v1
- v1
- v1
- v2 [diff vs current]
- v1
- v1
- v1
- v1
- v1
- v2 [diff vs current]
- v1
- v1
- v1
- v2 [diff vs current]
- v1
- v1
From: Alexander Duyck <redacted> We still had some code floating around from the old single buffer receive path. As a result we were adding VLAN_HLEN to max_frame although the resultant value was never used. Since that is the case we can drop this from the function. Signed-off-by: Alexander Duyck <redacted> Tested-by: Phil Schmitt <redacted> Signed-off-by: Jeff Kirsher <redacted> --- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 3 --- 1 file changed, 3 deletions(-)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index c1ce6e9..88d636a 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c@@ -3289,9 +3289,6 @@ static void ixgbe_set_rx_buffer_len(struct ixgbe_adapter *adapter) IXGBE_WRITE_REG(hw, IXGBE_MHADD, mhadd); } - /* MHADD will allow an extra 4 bytes past for vlan tagged frames */ - max_frame += VLAN_HLEN; - hlreg0 = IXGBE_READ_REG(hw, IXGBE_HLREG0); /* set jumbo enable since MHADD.MFS is keeping size locked at max_frame */ hlreg0 |= IXGBE_HLREG0_JUMBOEN;
--
1.7.11.7