aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet
diff options
context:
space:
mode:
authorAlexander Duyck <alexander.h.duyck@intel.com>2012-09-07 23:17:01 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2012-10-23 00:16:52 -0400
commit505e371808f9157b3e7678a46b010e9988a9bdce (patch)
tree0f1d2ebef69806c12dffd299dfe32b0a994196f2 /drivers/net/ethernet
parent71a49f777d6caa84b2b8ea376fcf181fe221d063 (diff)
ixgbe: Drop unnecessary addition from ixgbe_set_rx_buffer_len
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 <alexander.h.duyck@intel.com> Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_main.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index c1ce6e9cc67e..88d636a7459c 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)
3289 IXGBE_WRITE_REG(hw, IXGBE_MHADD, mhadd); 3289 IXGBE_WRITE_REG(hw, IXGBE_MHADD, mhadd);
3290 } 3290 }
3291 3291
3292 /* MHADD will allow an extra 4 bytes past for vlan tagged frames */
3293 max_frame += VLAN_HLEN;
3294
3295 hlreg0 = IXGBE_READ_REG(hw, IXGBE_HLREG0); 3292 hlreg0 = IXGBE_READ_REG(hw, IXGBE_HLREG0);
3296 /* set jumbo enable since MHADD.MFS is keeping size locked at max_frame */ 3293 /* set jumbo enable since MHADD.MFS is keeping size locked at max_frame */
3297 hlreg0 |= IXGBE_HLREG0_JUMBOEN; 3294 hlreg0 |= IXGBE_HLREG0_JUMBOEN;