From 245b6c80ab22f2803ccc5838ff7a2fac10360472 Mon Sep 17 00:00:00 2001 From: Alexander Duyck Date: Sat, 8 Sep 2012 03:17:01 +0000 Subject: [PATCH] --- yaml --- r: 340457 b: refs/heads/master c: 505e371808f9157b3e7678a46b010e9988a9bdce h: refs/heads/master i: 340455: cfa0fafa5ff96719fe6bd6efa2da580a744bfdae v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 46912400bdfd..b5ed0e1bc697 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 71a49f777d6caa84b2b8ea376fcf181fe221d063 +refs/heads/master: 505e371808f9157b3e7678a46b010e9988a9bdce diff --git a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index c1ce6e9cc67e..88d636a7459c 100644 --- a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/trunk/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;