diff options
| author | David S. Miller <davem@davemloft.net> | 2016-08-18 23:04:40 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-08-18 23:04:40 -0700 |
| commit | 92bcdcc672f536c0d1ac288621ad7b7aaf138063 (patch) | |
| tree | 39d67b1fefe50a9da26d12ed659f7c158e9110b9 /include/linux | |
| 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 'include/linux')
| -rw-r--r-- | include/linux/qed/qed_if.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/linux/qed/qed_if.h b/include/linux/qed/qed_if.h index 3ed7d20e3811..d8dc5c2243d5 100644 --- a/include/linux/qed/qed_if.h +++ b/include/linux/qed/qed_if.h @@ -318,9 +318,11 @@ struct qed_link_params { struct qed_link_output { bool link_up; - u32 supported_caps; /* In SUPPORTED defs */ - u32 advertised_caps; /* In ADVERTISED defs */ - u32 lp_caps; /* In ADVERTISED defs */ + /* In QED_LM_* defs */ + u32 supported_caps; + u32 advertised_caps; + u32 lp_caps; + u32 speed; /* In Mb/s */ u8 duplex; /* In DUPLEX defs */ u8 port; /* In PORT defs */ |