diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-03-22 22:43:06 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-03-22 22:43:06 -0700 |
| commit | b50fea1f261d2f011e9ee28e3e30c21eb2e680d5 (patch) | |
| tree | e0ff90b8290efbe3004ad0307b0fdcebe0f330fa /include/linux | |
| parent | 1cc6571f562774f1d928dc8b3cff50829b86e970 (diff) | |
| parent | 4ee9b0dcf09f426fbad7ed132d73ea2ba379d8ee (diff) | |
Merge branch 'remove-phylink_state-s-an_enabled-member'
Russell King says:
====================
Remove phylink_state's an_enabled member
Now that all the fixes and correctness patches have been merged, it is
time to switch the two users that make use of .an_enabled to check the
Autoneg bit in the advertising mask, and finally remove the
.an_enabled member.
The first two patches remove the last uses of .an_enabled, which are
in DPAA2 and XPCS. The final patch removes the member.
====================
Link: https://lore.kernel.org/r/ZBnT6yW9UY1sAsiy@shell.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/phylink.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/phylink.h b/include/linux/phylink.h index c492c26202b5..9ff56b050584 100644 --- a/include/linux/phylink.h +++ b/include/linux/phylink.h @@ -93,7 +93,6 @@ static inline bool phylink_autoneg_inband(unsigned int mode) * the medium link mode (@speed and @duplex) and the speed/duplex of the phy * interface mode (@interface) are different. * @link: true if the link is up. - * @an_enabled: true if autonegotiation is enabled/desired. * @an_complete: true if autonegotiation has completed. */ struct phylink_link_state { @@ -105,7 +104,6 @@ struct phylink_link_state { int pause; int rate_matching; unsigned int link:1; - unsigned int an_enabled:1; unsigned int an_complete:1; }; |