svn commit: r353669 - stable/11/sys/dev/ixgbe

[Eric Joyner]

Author: erj
Date: Wed Oct 16 21:54:48 2019
New Revision: 353669
URL: https://svnweb.freebsd.org/changeset/base/353669

Log:
  MFC r353599
  
  MFCs ixgbe: Disable EEE for backplane X550EM_X
  
  This prevents a possible kernel panic on X552 backplane devices.
  
  PR:		240320
  Sponsored by:   Intel Corporation

Modified:
  stable/11/sys/dev/ixgbe/if_ix.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/ixgbe/if_ix.c
==============================================================================
--- stable/11/sys/dev/ixgbe/if_ix.c	Wed Oct 16 21:49:44 2019	(r353668)
+++ stable/11/sys/dev/ixgbe/if_ix.c	Wed Oct 16 21:54:48 2019	(r353669)
@@ -4591,7 +4591,7 @@ ixgbe_sysctl_eee_state(SYSCTL_HANDLER_ARGS)
 	if ((new_eee < 0) || (new_eee > 1))
 		return (EINVAL);
 
-	retval = adapter->hw.mac.ops.setup_eee(&adapter->hw, new_eee);
+	retval = ixgbe_setup_eee(&adapter->hw, new_eee);
 	if (retval) {
 		device_printf(dev, "Error in EEE setup: 0x%08X\n", retval);
 		return (EINVAL);
@@ -4645,8 +4645,6 @@ ixgbe_init_device_features(struct adapter *adapter)
 	case ixgbe_mac_X550EM_x:
 		adapter->feat_cap |= IXGBE_FEATURE_SRIOV;
 		adapter->feat_cap |= IXGBE_FEATURE_FDIR;
-		if (adapter->hw.device_id == IXGBE_DEV_ID_X550EM_X_KR)
-			adapter->feat_cap |= IXGBE_FEATURE_EEE;
 		break;
 	case ixgbe_mac_X550EM_a:
 		adapter->feat_cap |= IXGBE_FEATURE_SRIOV;