Commit d194fd26 authored by Yuval Mintz's avatar Yuval Mintz Committed by David S. Miller

qed*: Fix pause setting

When moving into using ethtool's link_ksetting, qed started
supplying its own bitmask of speed/capabilities, but qede
is still checking for the SUPPORTED value to determine whether
it supports pause.

Fixes: 054c67d1 ("qed*: Add support for ethtool link_ksettings callbacks")
Signed-off-by: default avatarYuval Mintz <Yuval.Mintz@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a5c88182
...@@ -672,7 +672,7 @@ static int qede_set_pauseparam(struct net_device *dev, ...@@ -672,7 +672,7 @@ static int qede_set_pauseparam(struct net_device *dev,
memset(&params, 0, sizeof(params)); memset(&params, 0, sizeof(params));
params.override_flags |= QED_LINK_OVERRIDE_PAUSE_CONFIG; params.override_flags |= QED_LINK_OVERRIDE_PAUSE_CONFIG;
if (epause->autoneg) { 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"); DP_INFO(edev, "autoneg not supported\n");
return -EINVAL; return -EINVAL;
} }
......
...@@ -318,9 +318,11 @@ struct qed_link_params { ...@@ -318,9 +318,11 @@ struct qed_link_params {
struct qed_link_output { struct qed_link_output {
bool link_up; bool link_up;
u32 supported_caps; /* In SUPPORTED defs */ /* In QED_LM_* defs */
u32 advertised_caps; /* In ADVERTISED defs */ u32 supported_caps;
u32 lp_caps; /* In ADVERTISED defs */ u32 advertised_caps;
u32 lp_caps;
u32 speed; /* In Mb/s */ u32 speed; /* In Mb/s */
u8 duplex; /* In DUPLEX defs */ u8 duplex; /* In DUPLEX defs */
u8 port; /* In PORT defs */ u8 port; /* In PORT defs */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment