Merge remote-tracking branch 'omap_dss2/for-next'

[deliverable/linux.git] / drivers / net / ethernet / intel / ixgbe / ixgbe_ethtool.c

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
index 0d7209eb5abfd4e71636b932176f17a98f822293..9547191e26c9d9bd272db6b21294da63b0991972 100644 (file)
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
@@ -193,7 +193,9 @@ static int ixgbe_get_settings(struct net_device *netdev,
        if (supported_link & IXGBE_LINK_SPEED_10GB_FULL)
                ecmd->supported |= ixgbe_get_supported_10gtypes(hw);
        if (supported_link & IXGBE_LINK_SPEED_1GB_FULL)
-               ecmd->supported |= SUPPORTED_1000baseT_Full;
+               ecmd->supported |= (ixgbe_isbackplane(hw->phy.media_type)) ?
+                                  SUPPORTED_1000baseKX_Full :
+                                  SUPPORTED_1000baseT_Full;
        if (supported_link & IXGBE_LINK_SPEED_100_FULL)
                ecmd->supported |= ixgbe_isbackplane(hw->phy.media_type) ?
                                   SUPPORTED_1000baseKX_Full :