netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Alexander Duyck <alexander.h.duyck@intel.com>,
	netdev@vger.kernel.org, gospo@redhat.com, sassmann@redhat.com,
	Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 10/12] ixgbe: Drop unnecessary addition from ixgbe_set_rx_buffer_len
Date: Mon, 22 Oct 2012 21:26:23 -0700	[thread overview]
Message-ID: <1350966385-19020-11-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1350966385-19020-1-git-send-email-jeffrey.t.kirsher@intel.com>

From: Alexander Duyck <alexander.h.duyck@intel.com>

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>
---
 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

  parent reply	other threads:[~2012-10-23  4:26 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-23  4:26 [net-next 00/12][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2012-10-23  4:26 ` [net-next 01/12] ixgbe: Add support for IPv6 and UDP to ixgbe_get_headlen Jeff Kirsher
2012-10-23  4:26 ` [net-next 02/12] ixgbe: Add support for tracking the default user priority to SR-IOV Jeff Kirsher
2012-10-23  4:26 ` [net-next 03/12] ixgbe: Add support for GET_QUEUES message to get DCB configuration Jeff Kirsher
2012-10-23  4:26 ` [net-next 04/12] ixgbe: Enable support for VF API version 1.1 in the PF Jeff Kirsher
2012-10-23  4:26 ` [net-next 05/12] ixgbevf: Add VF DCB + SR-IOV support Jeff Kirsher
2012-10-23  4:26 ` [net-next 06/12] ixgbe: add WOL support for new subdevice id Jeff Kirsher
2012-10-23  4:26 ` [net-next 07/12] ixgbe: (PTP) refactor init, cyclecounter and reset Jeff Kirsher
2012-10-23  4:26 ` [net-next 08/12] ixgbe: using is_zero_ether_addr() to simplify the code Jeff Kirsher
2012-10-23  4:45   ` Joe Perches
2012-10-23  5:17     ` Jeff Kirsher
2012-10-23 19:35       ` Joe Perches
2012-10-23  4:26 ` [net-next 09/12] ixgbe: Correcting small packet padding Jeff Kirsher
2012-10-23  4:26 ` Jeff Kirsher [this message]
2012-10-23  4:26 ` [net-next 11/12] ixgbe: Add function ixgbe_reset_pipeline_82599 Jeff Kirsher
2012-10-23  4:26 ` [net-next 12/12] ixgbe: Fix possible memory leak in ixgbe_set_ringparam Jeff Kirsher
2012-10-23  6:51 ` [net-next 00/12][pull request] Intel Wired LAN Driver Updates David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1350966385-19020-11-git-send-email-jeffrey.t.kirsher@intel.com \
    --to=jeffrey.t.kirsher@intel.com \
    --cc=alexander.h.duyck@intel.com \
    --cc=davem@davemloft.net \
    --cc=gospo@redhat.com \
    --cc=netdev@vger.kernel.org \
    --cc=sassmann@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).