Skip to content

Commit 01cf893

Browse files
lunndavem330
authored andcommitted
net: intel: i40e/igc: Remove setting Autoneg in EEE capabilities
Energy Efficient Ethernet should always be negotiated with the link peer. Don't include SUPPORTED_Autoneg in the results of get_eee() for supported, advertised or lp_advertised, since it is assumed. Additionally, ethtool(1) ignores the set bit, and no other driver sets this. Reviewed-by: Jacob Keller <jacob.e.keller@intel.com> Signed-off-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 9356b6d commit 01cf893

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

drivers/net/ethernet/intel/i40e/i40e_ethtool.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5664,16 +5664,12 @@ static int i40e_get_eee(struct net_device *netdev, struct ethtool_keee *edata)
56645664
if (phy_cfg.eee_capability == 0)
56655665
return -EOPNOTSUPP;
56665666

5667-
edata->supported_u32 = SUPPORTED_Autoneg;
5668-
edata->lp_advertised_u32 = edata->supported_u32;
5669-
56705667
/* Get current configuration */
56715668
status = i40e_aq_get_phy_capabilities(hw, false, false, &phy_cfg, NULL);
56725669
if (status)
56735670
return -EAGAIN;
56745671

5675-
edata->advertised_u32 = phy_cfg.eee_capability ? SUPPORTED_Autoneg : 0U;
5676-
edata->eee_enabled = !!edata->advertised_u32;
5672+
edata->eee_enabled = !!phy_cfg.eee_capability;
56775673
edata->tx_lpi_enabled = pf->stats.tx_lpi_status;
56785674

56795675
edata->eee_active = pf->stats.tx_lpi_status && pf->stats.rx_lpi_status;
@@ -5691,7 +5687,6 @@ static int i40e_is_eee_param_supported(struct net_device *netdev,
56915687
u32 value;
56925688
const char *name;
56935689
} param[] = {
5694-
{edata->advertised_u32 & ~SUPPORTED_Autoneg, "advertise"},
56955690
{edata->tx_lpi_timer, "tx-timer"},
56965691
{edata->tx_lpi_enabled != pf->stats.tx_lpi_status, "tx-lpi"}
56975692
};

drivers/net/ethernet/intel/igc/igc_ethtool.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1634,7 +1634,6 @@ static int igc_ethtool_get_eee(struct net_device *netdev,
16341634
mmd_eee_adv_to_ethtool_adv_t(adapter->eee_advert);
16351635

16361636
*edata = adapter->eee;
1637-
edata->supported_u32 = SUPPORTED_Autoneg;
16381637

16391638
eeer = rd32(IGC_EEER);
16401639

@@ -1647,9 +1646,6 @@ static int igc_ethtool_get_eee(struct net_device *netdev,
16471646

16481647
edata->eee_enabled = hw->dev_spec._base.eee_enable;
16491648

1650-
edata->advertised_u32 = SUPPORTED_Autoneg;
1651-
edata->lp_advertised_u32 = SUPPORTED_Autoneg;
1652-
16531649
/* Report correct negotiated EEE status for devices that
16541650
* wrongly report EEE at half-duplex
16551651
*/

0 commit comments

Comments
 (0)