Commit 9e892688 authored Dec 07, 2021 by Jakub Kicinski

Merge branch 'net-phy-fix-doc-build-warning'

Yanteng Si says:

====================
net: phy: Fix doc build warnings
====================

Link: https://lore.kernel.org/r/cover.1638776933.git.siyanteng@loongson.cn


Signed-off-by: Jakub Kicinski <kuba@kernel.org>

parents e6f60c51 c35e8de7

drivers/net/phy/phylink.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -1388,6 +1388,7 @@ EXPORT_SYMBOL_GPL(phylink_stop);
		* @mac_wol: true if the MAC needs to receive packets for Wake-on-Lan
		*
		* Handle a network device suspend event. There are several cases:
		*
		* - If Wake-on-Lan is not active, we can bring down the link between
		* the MAC and PHY by calling phylink_stop().
		* - If Wake-on-Lan is active, and being handled only by the PHY, we

include/linux/phy.h

+6 −5

Original line number	Diff line number	Diff line
		@@ -538,10 +538,11 @@ struct macsec_ops;
		* @mac_managed_pm: Set true if MAC driver takes of suspending/resuming PHY
		* @state: State of the PHY for management purposes
		* @dev_flags: Device-specific flags used by the PHY driver.
		* Bits [15:0] are free to use by the PHY driver to communicate
		*
		* - Bits [15:0] are free to use by the PHY driver to communicate
		* driver specific behavior.
		* Bits [23:16] are currently reserved for future use.
		* Bits [31:24] are reserved for defining generic
		* - Bits [23:16] are currently reserved for future use.
		* - Bits [31:24] are reserved for defining generic
		* PHY driver behavior.
		* @irq: IRQ number of the PHY's interrupt (-1 if none)
		* @phy_timer: The timer for handling the state machine