diff options
| author | David S. Miller | 2016-08-18 23:04:40 -0700 |
|---|---|---|
| committer | David S. Miller | 2016-08-18 23:04:40 -0700 |
| commit | 92bcdcc672f536c0d1ac288621ad7b7aaf138063 (patch) | |
| tree | 39d67b1fefe50a9da26d12ed659f7c158e9110b9 /drivers | |
| parent | a5c88182006105cbd6f882e2e789d2cfc823de3c (diff) | |
| parent | 16d5946a7c966643a78d68ff54ae5c2ddd2e5b63 (diff) | |
Merge branch 'qed-link-fixes'
Yuval Mintz says:
====================
qed*: Fix ethtool issues relating to link
This series addresses two issues that were introduced when adding
support for ethtool's link_ksettings support - the first fixes a
regression and second incorrect functionallity in the submission.
Although these are fixes, as the feature currently exists only in
'next-next' I'm aiming them for it.
Dave, please consider applying this series to 'net-next'.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/qlogic/qede/qede_ethtool.c b/drivers/net/ethernet/qlogic/qede/qede_ethtool.c index 6e17ee10e748..f6b8899cda7f 100644 --- a/drivers/net/ethernet/qlogic/qede/qede_ethtool.c +++ b/drivers/net/ethernet/qlogic/qede/qede_ethtool.c @@ -414,7 +414,7 @@ static int qede_set_link_ksettings(struct net_device *dev, } params.adv_speeds = QED_LM_40000baseLR4_Full_BIT; break; - case 0xdead: + case SPEED_50000: if (!(current_link.supported_caps & QED_LM_50000baseKR2_Full_BIT)) { DP_INFO(edev, "50G speed not supported\n"); @@ -422,7 +422,7 @@ static int qede_set_link_ksettings(struct net_device *dev, } params.adv_speeds = QED_LM_50000baseKR2_Full_BIT; break; - case 0xbeef: + case SPEED_100000: if (!(current_link.supported_caps & QED_LM_100000baseKR4_Full_BIT)) { DP_INFO(edev, "100G speed not supported\n"); @@ -672,7 +672,7 @@ static int qede_set_pauseparam(struct net_device *dev, memset(¶ms, 0, sizeof(params)); params.override_flags |= QED_LINK_OVERRIDE_PAUSE_CONFIG; if (epause->autoneg) { - if (!(current_link.supported_caps & SUPPORTED_Autoneg)) { + if (!(current_link.supported_caps & QED_LM_Autoneg_BIT)) { DP_INFO(edev, "autoneg not supported\n"); return -EINVAL; } |