]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
i40e: Removing unnecessary code which caused supported link mode bug
authorAvinash Dayanand <avinash.dayanand@intel.com>
Mon, 16 May 2016 17:26:40 +0000 (10:26 -0700)
committerDhaval Giani <dhaval.giani@oracle.com>
Wed, 8 Mar 2017 00:30:32 +0000 (19:30 -0500)
Orabug: 24568124

Removing this code which wasn't allowing 100BaseT to show up in the supported
link modes for 10GBaseT PHYs.

Change-ID: Iada2eafa7ef6b4bac9a2a1380ff533ae5de51e1d
Signed-off-by: Avinash Dayanand <avinash.dayanand@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit 01a7a9fef44e5b2f994174c2c1fda80178214d8d)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
Signed-off-by: Dhaval Giani <dhaval.giani@oracle.com>
drivers/net/ethernet/intel/i40e/i40e_ethtool.c

index a55ab2e7b84e532479f5cd140c8133df0f8f7b64..bdbfee97dceee19ddac55f4b0e0ff7429b940267 100644 (file)
@@ -313,8 +313,7 @@ static void i40e_phy_type_to_ethtool(struct i40e_pf *pf, u32 *supported,
                *advertising |= ADVERTISED_Autoneg |
                                ADVERTISED_40000baseCR4_Full;
        }
-       if ((phy_types & I40E_CAP_PHY_TYPE_100BASE_TX) &&
-           !(phy_types & I40E_CAP_PHY_TYPE_1000BASE_T)) {
+       if (phy_types & I40E_CAP_PHY_TYPE_100BASE_TX) {
                *supported |= SUPPORTED_Autoneg |
                              SUPPORTED_100baseT_Full;
                *advertising |= ADVERTISED_Autoneg |