sfc: 10Xpress: Report support for pause frames
Subsystems (2)
PATCH 1/1 sfc: 10Xpress: Report support for pause frames
Commits 27fbc7d 'mdio: Expose pause frame advertising flags to ethtool' and c634263 'sfc: 10Xpress: Initialise pause advertising flags' added to our reported advertising flags.
efx_mdio_set_settings() requires that all advertising flags are also present in the supported flags, so make sure that is true.
---
This fixes a regression in 2.6.32: after resetting a 10Xpress PHY we fail to reconfigure it if pause frames are enabled. Manually changing pause frame settings will also fail.
Ben.
drivers/net/sfc/tenxpress.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
drivers/net/sfc/tenxpress.c +1 -0
@@ -752,6 +752,7 @@ tenxpress_get_settings(struct efx_nic *efx, struct ethtool_cmd *ecmd)mdio45_ethtool_gset_npage (&efx->mdio, ecmd, adv, lpa); + ecmd->supported |= SUPPORTED_Pause | SUPPORTED_Asym_Pause;if (efx->phy_type !=PHY_TYPE_SFX7101 ) { ecmd->supported |= (SUPPORTED_100baseT_Full | SUPPORTED_1000baseT_Full);
Signature · 3 lines
Ben Hutchings, Senior Software Engineer, Solarflare Communications Not speaking for my employer; that's the marketing department's job. They asked us to note that Solarflare product names are trademarked.
Quoted 4 lines · Ben Hutchings
Commits 27fbc7d 'mdio: Expose pause frame advertising flags to ethtool' and c634263 'sfc: 10Xpress: Initialise pause advertising flags' added to our reported advertising flags.
Quoted 8 lines
efx_mdio_set_settings()requires that all advertising flags are also present in the supported flags, so make sure that is true.Signed-off-by Ben Hutchings <[email protected]>---
This fixes a regression in 2.6.32: after resetting a 10Xpress PHY we fail to reconfigure it if pause frames are enabled. Manually changing pause frame settings will also fail.
Sorry, I was mistaken - those earlier commits are only in net-next-2.6, so this is not needed for 2.6.32.
Ben.
Signature · 3 lines
Ben Hutchings, Senior Software Engineer, Solarflare Communications Not speaking for my employer; that's the marketing department's job. They asked us to note that Solarflare product names are trademarked.
David Miller
maintainerFrom: Ben Hutchings <[email protected]>
Date: Thu, 22 Oct 2009 23:30:02 +0100
Quoted 2 lines
Sorry, I was mistaken - those earlier commits are only in net-next-2.6, so this is not needed for 2.6.32.
Ok, I'll move the patch over to net-next-2.6 then, thanks.
From: Ben Hutchings <[email protected]>
Date: Thu, 22 Oct 2009 23:25:14 +0100
Quoted 8 lines
Commits 27fbc7d 'mdio: Expose pause frame advertising flags to ethtool' and c634263 'sfc: 10Xpress: Initialise pause advertising flags' added to our reported advertising flags.
efx_mdio_set_settings()requires that all advertising flags are also present in the supported flags, so make sure that is true.Signed-off-by Ben Hutchings <[email protected]>
Applied, thanks.