svn commit: r282819 - stable/10/sys/dev/ixgbe

[Marcelo Araujo]

Author: araujo (ports committer)
Date: Tue May 12 16:36:54 2015
New Revision: 282819
URL: https://svnweb.freebsd.org/changeset/base/282819

Log:
  Fix the media detected for copper cables NIC based on chipsest X540T.
  
  Requested by:	hiren@
  MFH:		279803

Modified:
  stable/10/sys/dev/ixgbe/ixgbe.c

Modified: stable/10/sys/dev/ixgbe/ixgbe.c
==============================================================================
--- stable/10/sys/dev/ixgbe/ixgbe.c	Tue May 12 15:21:19 2015	(r282818)
+++ stable/10/sys/dev/ixgbe/ixgbe.c	Tue May 12 16:36:54 2015	(r282819)
@@ -1673,6 +1673,7 @@ static void
 ixgbe_media_status(struct ifnet * ifp, struct ifmediareq * ifmr)
 {
 	struct adapter *adapter = ifp->if_softc;
+       struct ixgbe_hw *hw = &adapter->hw;
 
 	INIT_DEBUGOUT("ixgbe_media_status: begin");
 	IXGBE_CORE_LOCK(adapter);
@@ -1688,17 +1689,28 @@ ixgbe_media_status(struct ifnet * ifp, s
 
 	ifmr->ifm_status |= IFM_ACTIVE;
 
-	switch (adapter->link_speed) {
-		case IXGBE_LINK_SPEED_100_FULL:
-			ifmr->ifm_active |= IFM_100_TX | IFM_FDX;
-			break;
-		case IXGBE_LINK_SPEED_1GB_FULL:
-			ifmr->ifm_active |= IFM_1000_SX | IFM_FDX;
-			break;
-		case IXGBE_LINK_SPEED_10GB_FULL:
-			ifmr->ifm_active |= adapter->optics | IFM_FDX;
-			break;
-	}
+       /*
+        * Not all NIC are 1000baseSX as an example X540T.
+        * We must set properly the media based on NIC model.
+        */
+       switch (hw->device_id) {
+              case IXGBE_DEV_ID_X540T:
+      			if (adapter->link_speed == IXGBE_LINK_SPEED_100_FULL)
+                            	ifmr->ifm_active |= IFM_100_TX | IFM_FDX;
+                     	else if (adapter->link_speed == IXGBE_LINK_SPEED_1GB_FULL)
+                            	ifmr->ifm_active |= IFM_1000_T | IFM_FDX;
+                     	else if (adapter->link_speed == IXGBE_LINK_SPEED_10GB_FULL)
+                            	ifmr->ifm_active |= adapter->optics | IFM_FDX;
+                     	break;
+              default:
+                     	if (adapter->link_speed == IXGBE_LINK_SPEED_100_FULL)
+                            	ifmr->ifm_active |= IFM_100_TX | IFM_FDX;
+                     	else if (adapter->link_speed == IXGBE_LINK_SPEED_1GB_FULL)
+                            	ifmr->ifm_active |= IFM_1000_SX | IFM_FDX;
+                     	else if (adapter->link_speed == IXGBE_LINK_SPEED_10GB_FULL)
+                            	ifmr->ifm_active |= adapter->optics | IFM_FDX;
+                     	break;
+       }
 
 	IXGBE_CORE_UNLOCK(adapter);