drivers/perf: Add Cavium ThunderX2 SoC UNCORE PMU driver

[mirror_ubuntu-bionic-kernel.git] / include / linux / netdevice.h

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index ef789e1d679efd349ed0b20c315defac1f1fb27c..384bd3d7c46b7b7826df44663d01a6d393af1c71 100644 (file)
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1669,8 +1669,6 @@ struct net_device {
        unsigned long           base_addr;
        int                     irq;
 
-       atomic_t                carrier_changes;
-
        /*
         *      Some hardware also needs these fields (state,dev_list,
         *      napi_list,unreg_list,close_list) but they are not
@@ -1708,6 +1706,10 @@ struct net_device {
        atomic_long_t           tx_dropped;
        atomic_long_t           rx_nohandler;
 
+       /* Stats to monitor link on/off, flapping */
+       atomic_t                carrier_up_count;
+       atomic_t                carrier_down_count;
+
 #ifdef CONFIG_WIRELESS_EXT
        const struct iw_handler_def *wireless_handlers;
        struct iw_public_data   *wireless_data;
@@ -4402,8 +4404,8 @@ do {                                                              \
        WARN(1, "netdevice: %s%s\n" format, netdev_name(dev),   \
             netdev_reg_state(dev), ##args)
 
-#define netdev_WARN_ONCE(dev, condition, format, arg...)               \
-       WARN_ONCE(1, "netdevice: %s%s\n" format, netdev_name(dev)       \
+#define netdev_WARN_ONCE(dev, format, args...)                         \
+       WARN_ONCE(1, "netdevice: %s%s\n" format, netdev_name(dev),      \
                  netdev_reg_state(dev), ##args)
 
 /* netif printk helpers, similar to netdev_printk */