From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>,
netdev@vger.kernel.org, gospo@redhat.com, sassmann@redhat.com,
Michael Tokarev <mjt@tls.msk.ru>,
David Lamparter <equinox@diac24.net>,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net 02/10] e100: make sure vlan support isn't advertised on old adapters
Date: Wed, 2 Nov 2011 17:19:53 -0700 [thread overview]
Message-ID: <1320279601-1276-3-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1320279601-1276-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: Jesse Brandeburg <jesse.brandeburg@intel.com>
e100 parts don't support vlan offload but they generally do
allow use of vlans in higher software layers via the 8021q module.
That said, there are a couple of really old revisions of e100
hardware that don't even allow the longer frame sizes
required for vlan use with standard MTU.
Use the VLAN_CHALLENGED flag to prevent vlan binding to these
devices.
Reported-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
CC: Michael Tokarev <mjt@tls.msk.ru>
CC: David Lamparter <equinox@diac24.net>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/e100.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/drivers/net/ethernet/intel/e100.c b/drivers/net/ethernet/intel/e100.c
index ae17cd1..5a2fdf7 100644
--- a/drivers/net/ethernet/intel/e100.c
+++ b/drivers/net/ethernet/intel/e100.c
@@ -2810,6 +2810,10 @@ static int __devinit e100_probe(struct pci_dev *pdev,
e100_get_defaults(nic);
+ /* D100 MAC doesn't allow rx of vlan packets with normal MTU */
+ if (nic->mac < mac_82558_D101_A4)
+ netdev->features |= NETIF_F_VLAN_CHALLENGED;
+
/* locks must be initialized before calling hw_reset */
spin_lock_init(&nic->cb_lock);
spin_lock_init(&nic->cmd_lock);
--
1.7.6.4
next prev parent reply other threads:[~2011-11-03 0:20 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-03 0:19 [net 00/10][pull request] Intel Wired LAN Driver Update Jeff Kirsher
2011-11-03 0:19 ` [net 01/10] e1000e: demote a debugging WARN to a debug log message Jeff Kirsher
2011-11-03 0:19 ` Jeff Kirsher [this message]
2011-11-03 0:19 ` [net 03/10] igb: Fix for I347AT4 PHY cable length unit detection Jeff Kirsher
2011-11-03 0:19 ` [net 04/10] ixgbe: Fix link issues caused by a reset while interface is down Jeff Kirsher
2011-11-03 0:19 ` [net 05/10] ixgbe: fix disabling of Tx laser at probe Jeff Kirsher
2011-11-03 0:19 ` [net 06/10] ixgbe: fix smatch splat due to missing NULL check Jeff Kirsher
2011-11-03 0:19 ` [net 07/10] ixgbe: Fix compiler warnings Jeff Kirsher
2011-11-03 0:19 ` [net 08/10] ixgbe: fix reading of the buffer returned by the firmware Jeff Kirsher
2011-11-03 0:20 ` [net 09/10] ixgbe: DCB, return max for IEEE traffic classes Jeff Kirsher
2011-11-03 0:20 ` [net 10/10] ixgbevf: Update release version Jeff Kirsher
2011-11-04 1:57 ` [net 00/10][pull request] Intel Wired LAN Driver Update 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=1320279601-1276-3-git-send-email-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=davem@davemloft.net \
--cc=equinox@diac24.net \
--cc=gospo@redhat.com \
--cc=jesse.brandeburg@intel.com \
--cc=mjt@tls.msk.ru \
--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