diff options
| author | David S. Miller <davem@davemloft.net> | 2018-01-23 11:06:51 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-23 11:06:51 -0500 |
| commit | d76632751af45cbcdac4ff355bdb4e841508dd41 (patch) | |
| tree | a59a9ecceb17fd2aaf39ab79d31774aee7998369 /net/core/dev.c | |
| parent | net: aquantia: make symbol hw_atl_boards static (diff) | |
| parent | net: core: Fix kernel-doc for netdev_upper_link() (diff) | |
| download | linux-d76632751af45cbcdac4ff355bdb4e841508dd41.tar.gz linux-d76632751af45cbcdac4ff355bdb4e841508dd41.zip | |
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>
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 94435cd09072..77795f66c246 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -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 |