Merge branch 'Kernel-doc-fixes-for-networking'
Florian Fainelli says: ==================== Kernel doc fixes for networking This patch series fixes kernel doc warnings found while running make htmldocs pertaining to the networking subsystem. There is a finaly set of warnings due to PHYLINK which I have not been able to resolve yet. The last patch could thereoteically be applied to 'net' since the commit referenced by the Fixes: tag is present in v4.15-rcX. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
d76632751a
|
@ -441,7 +441,7 @@ EXPORT_SYMBOL_GPL(sfp_upstream_stop);
|
|||
|
||||
/**
|
||||
* sfp_register_upstream() - Register the neighbouring device
|
||||
* @np: device node for the SFP bus
|
||||
* @fwnode: firmware node for the SFP bus
|
||||
* @ndev: network device associated with the interface
|
||||
* @upstream: the upstream private data
|
||||
* @ops: the upstream's &struct sfp_upstream_ops
|
||||
|
|
|
@ -1469,8 +1469,6 @@ enum netdev_priv_flags {
|
|||
* @base_addr: Device I/O address
|
||||
* @irq: Device IRQ number
|
||||
*
|
||||
* @carrier_changes: Stats to monitor carrier on<->off transitions
|
||||
*
|
||||
* @state: Generic network queuing layer state, see netdev_state_t
|
||||
* @dev_list: The global list of network devices
|
||||
* @napi_list: List entry used for polling NAPI devices
|
||||
|
@ -1506,6 +1504,8 @@ enum netdev_priv_flags {
|
|||
* do not use this in drivers
|
||||
* @rx_nohandler: nohandler dropped packets by core network on
|
||||
* inactive devices, do not use this in drivers
|
||||
* @carrier_up_count: Number of times the carrier has been up
|
||||
* @carrier_down_count: Number of times the carrier has been down
|
||||
*
|
||||
* @wireless_handlers: List of functions to handle Wireless Extensions,
|
||||
* instead of ioctl,
|
||||
|
|
|
@ -1694,7 +1694,6 @@ EXPORT_SYMBOL(unregister_netdevice_notifier);
|
|||
/**
|
||||
* call_netdevice_notifiers_info - call all network notifier blocks
|
||||
* @val: value passed unmodified to notifier function
|
||||
* @dev: net_device pointer passed unmodified to notifier function
|
||||
* @info: notifier information data
|
||||
*
|
||||
* Call all network notifier blocks. Parameters and return value
|
||||
|
@ -6425,6 +6424,7 @@ rollback:
|
|||
* netdev_upper_dev_link - Add a link to the upper device
|
||||
* @dev: device
|
||||
* @upper_dev: new upper device
|
||||
* @extack: netlink extended ack
|
||||
*
|
||||
* Adds a link to device which is upper to this one. The caller must hold
|
||||
* the RTNL lock. On a failure a negative errno code is returned.
|
||||
|
@ -6446,6 +6446,7 @@ EXPORT_SYMBOL(netdev_upper_dev_link);
|
|||
* @upper_dev: new upper device
|
||||
* @upper_priv: upper device private
|
||||
* @upper_info: upper info to be passed down via notifier
|
||||
* @extack: netlink extended ack
|
||||
*
|
||||
* Adds a link to device which is upper to this one. In this case, only
|
||||
* one master upper device can be linked, although other non-master devices
|
||||
|
|
Loading…
Reference in a new issue