Commit 9e892688 authored by Jakub Kicinski's avatar 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.cnSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents e6f60c51 c35e8de7
...@@ -1388,6 +1388,7 @@ EXPORT_SYMBOL_GPL(phylink_stop); ...@@ -1388,6 +1388,7 @@ EXPORT_SYMBOL_GPL(phylink_stop);
* @mac_wol: true if the MAC needs to receive packets for Wake-on-Lan * @mac_wol: true if the MAC needs to receive packets for Wake-on-Lan
* *
* Handle a network device suspend event. There are several cases: * Handle a network device suspend event. There are several cases:
*
* - If Wake-on-Lan is not active, we can bring down the link between * - If Wake-on-Lan is not active, we can bring down the link between
* the MAC and PHY by calling phylink_stop(). * the MAC and PHY by calling phylink_stop().
* - If Wake-on-Lan is active, and being handled only by the PHY, we * - If Wake-on-Lan is active, and being handled only by the PHY, we
......
...@@ -538,11 +538,12 @@ struct macsec_ops; ...@@ -538,11 +538,12 @@ struct macsec_ops;
* @mac_managed_pm: Set true if MAC driver takes of suspending/resuming PHY * @mac_managed_pm: Set true if MAC driver takes of suspending/resuming PHY
* @state: State of the PHY for management purposes * @state: State of the PHY for management purposes
* @dev_flags: Device-specific flags used by the PHY driver. * @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 [15:0] are free to use by the PHY driver to communicate
* Bits [23:16] are currently reserved for future use. * driver specific behavior.
* Bits [31:24] are reserved for defining generic * - Bits [23:16] are currently reserved for future use.
* PHY driver behavior. * - Bits [31:24] are reserved for defining generic
* PHY driver behavior.
* @irq: IRQ number of the PHY's interrupt (-1 if none) * @irq: IRQ number of the PHY's interrupt (-1 if none)
* @phy_timer: The timer for handling the state machine * @phy_timer: The timer for handling the state machine
* @phylink: Pointer to phylink instance for this PHY * @phylink: Pointer to phylink instance for this PHY
......
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