From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Vlad Yasevich <vyasevic@redhat.com>,
e1000-devel@lists.sourceforge.net, netdev@vger.kernel.org,
gospo@redhat.com, sassmann@redhat.com
Subject: [net 3/7] e1000e: Correctly include VLAN_HLEN when changing interface MTU
Date: Fri, 18 Apr 2014 18:59:23 -0700 [thread overview]
Message-ID: <1397872767-4001-4-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1397872767-4001-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: Vlad Yasevich <vyasevic@redhat.com>
When changing the interface mtu, the driver starts with a value
that doesn't include VLAN_HLEN. Later tests in the driver
set the rx_buffer_len based on the mtu. As a result, when
the user increases the mtu to 1504 (to support 802.1AD for example),
the driver rx_buffer_len does not change and frames longer
the 1522 bytes are rejected as too long.
Include VLAN_HLEN from the start so that an user mtu greater then
1500 bytes is correctly reflected in the driver rx_buffer_len.
CC: e1000-devel@lists.sourceforge.net
Signed-off-by: Vlad Yasevich <vyasevic@redhat.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/e1000e/netdev.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index d50c91e..165f7bc 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -5687,7 +5687,7 @@ struct rtnl_link_stats64 *e1000e_get_stats64(struct net_device *netdev,
static int e1000_change_mtu(struct net_device *netdev, int new_mtu)
{
struct e1000_adapter *adapter = netdev_priv(netdev);
- int max_frame = new_mtu + ETH_HLEN + ETH_FCS_LEN;
+ int max_frame = new_mtu + VLAN_HLEN + ETH_HLEN + ETH_FCS_LEN;
/* Jumbo frame support */
if ((max_frame > ETH_FRAME_LEN + ETH_FCS_LEN) &&
--
1.9.0
------------------------------------------------------------------------------
Learn Graph Databases - Download FREE O'Reilly Book
"Graph Databases" is the definitive new guide to graph databases and their
applications. Written by three acclaimed leaders in the field,
this first edition is now available. Download your free book today!
http://p.sf.net/sfu/NeoTech
_______________________________________________
E1000-devel mailing list
E1000-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/e1000-devel
To learn more about Intel® Ethernet, visit http://communities.intel.com/community/wired
next prev parent reply other threads:[~2014-04-19 1:59 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-19 1:59 [net 0/7][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2014-04-19 1:59 ` [net 1/7] i40e: remove open-coded skb_cow_head Jeff Kirsher
2014-04-19 1:59 ` [net 2/7] i40e: fix TCP flag replication for hardware offload Jeff Kirsher
2014-04-19 1:59 ` Jeff Kirsher [this message]
2014-04-19 1:59 ` [net 4/7] e1000e: Enclose e1000e_pm_thaw() with CONFIG_PM_SLEEP Jeff Kirsher
2014-04-19 1:59 ` [net 5/7] igb: fix stats for i210 rx_fifo_errors Jeff Kirsher
2014-04-19 21:58 ` Sergei Shtylyov
2014-04-19 1:59 ` [net 6/7] ixgbe: clean up Rx time stamping code Jeff Kirsher
2014-04-19 1:59 ` [net 7/7] e1000e/igb/ixgbe/i40e: fix message terminations Jeff Kirsher
2014-04-21 16:58 ` [net 0/7][pull request] Intel Wired LAN Driver Updates David Miller
2014-04-21 20:15 ` Or Gerlitz
2014-04-21 20:24 ` Eric Dumazet
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=1397872767-4001-4-git-send-email-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=davem@davemloft.net \
--cc=e1000-devel@lists.sourceforge.net \
--cc=gospo@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=sassmann@redhat.com \
--cc=vyasevic@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).