Skip to content

Commit

Permalink
Merge branch 'net-phy-fix-doc-build-warning'
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jakub Kicinski committed Dec 8, 2021
2 parents e6f60c5 + c35e8de commit 9e89268
Showing 2 changed files with 7 additions and 5 deletions.
1 change: 1 addition & 0 deletions drivers/net/phy/phylink.c
Original file line number Diff line number Diff line change
@@ -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
11 changes: 6 additions & 5 deletions include/linux/phy.h
Original file line number Diff line number Diff line change
@@ -538,11 +538,12 @@ 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
* driver specific behavior.
* Bits [23:16] are currently reserved for future use.
* Bits [31:24] are reserved for defining generic
* PHY driver behavior.
*
* - 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
* PHY driver behavior.
* @irq: IRQ number of the PHY's interrupt (-1 if none)
* @phy_timer: The timer for handling the state machine
* @phylink: Pointer to phylink instance for this PHY

0 comments on commit 9e89268

Please sign in to comment.