diff options
| author | David S. Miller <davem@davemloft.net> | 2018-01-23 19:06:51 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-23 19:06:51 +0300 |
| commit | d76632751af45cbcdac4ff355bdb4e841508dd41 (patch) | |
| tree | a59a9ecceb17fd2aaf39ab79d31774aee7998369 /include/linux | |
| parent | e8a22b5f079449f1803d37ce2b5d09acaa68368d (diff) | |
| parent | 7a006d5988ebd99922784176d902a335b8eb5321 (diff) | |
| download | linux-d76632751af45cbcdac4ff355bdb4e841508dd41.tar.xz | |
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 'include/linux')
| -rw-r--r-- | include/linux/netdevice.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 837e9cb7e358..581495f4e487 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -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, |