summary refs log tree commit diff
path: root/drivers/net/ethernet/intel/e1000e/82571.c
diff options
context:
space:
mode:
authorMatthew Vick <matthew.vick@intel.com>2012-04-25 08:01:05 +0000
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2012-05-03 02:29:04 -0700
commitf6bd5577a39aed21cefd698bc46f70cfeaa0923c (patch)
treeaa5b9c51bf2d216e49e55e3f8b8b8a2557ff27c5 /drivers/net/ethernet/intel/e1000e/82571.c
parent885fe7be4b23d8b9e46cdd87148cefbec926868b (diff)
downloadlinux-f6bd5577a39aed21cefd698bc46f70cfeaa0923c.tar.gz
e1000e: Driver workaround for IPv6 Header Extension Erratum.
Previously, IPv6 extension header parsing was disabled for all devices
supported by e1000e when using packet split mode. However, as per a
silicon errata, only certain devices need this restriction and will need
to disable IPv6 extension header parsing for all modes.

Signed-off-by: Matthew Vick <matthew.vick@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e/82571.c')
-rw-r--r--drivers/net/ethernet/intel/e1000e/82571.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/82571.c b/drivers/net/ethernet/intel/e1000e/82571.c
index 7b02e87b0b65..98632f4561b2 100644
--- a/drivers/net/ethernet/intel/e1000e/82571.c
+++ b/drivers/net/ethernet/intel/e1000e/82571.c
@@ -1279,6 +1279,16 @@ static void e1000_initialize_hw_bits_82571(struct e1000_hw *hw)
 		ew32(CTRL_EXT, reg);
 	}
 
+	/*
+	 * Disable IPv6 extension header parsing because some malformed
+	 * IPv6 headers can hang the Rx.
+	 */
+	if (hw->mac.type <= e1000_82573) {
+		reg = er32(RFCTL);
+		reg |= (E1000_RFCTL_IPV6_EX_DIS | E1000_RFCTL_NEW_IPV6_EXT_DIS);
+		ew32(RFCTL, reg);
+	}
+
 	/* PCI-Ex Control Registers */
 	switch (hw->mac.type) {
 	case e1000_82574: