[NET]: Remove NETIF_F_INTERNAL_STATS, default to internal stats.

Herbert Xu conviced me that a new flag was overkill; every driver
currently overrides get_stats, so we might as well make the internal
one the default.  If someone did fail to set get_stats, they would now
get all 0 stats instead of "No statistics available".

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 20 insertions, 25 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index d5e42d13bd67..eb999003bbb7 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2101,26 +2101,23 @@ static void dev_seq_printf_stats(struct seq_file *seq, struct net_device *dev)
 {
         struct net_device_stats *stats = dev->get_stats(dev);
 
-        if (stats) {
-                seq_printf(seq, "%6s:%8lu %7lu %4lu %4lu %4lu %5lu %10lu %9lu "
-                                "%8lu %7lu %4lu %4lu %4lu %5lu %7lu %10lu\n",
-                           dev->name, stats->rx_bytes, stats->rx_packets,
-                           stats->rx_errors,
-                           stats->rx_dropped + stats->rx_missed_errors,
-                           stats->rx_fifo_errors,
-                           stats->rx_length_errors + stats->rx_over_errors +
-                             stats->rx_crc_errors + stats->rx_frame_errors,
-                           stats->rx_compressed, stats->multicast,
-                           stats->tx_bytes, stats->tx_packets,
-                           stats->tx_errors, stats->tx_dropped,
-                           stats->tx_fifo_errors, stats->collisions,
-                           stats->tx_carrier_errors +
-                             stats->tx_aborted_errors +
-                             stats->tx_window_errors +
-                             stats->tx_heartbeat_errors,
-                           stats->tx_compressed);
-        } else
-                seq_printf(seq, "%6s: No statistics available.\n", dev->name);
+        seq_printf(seq, "%6s:%8lu %7lu %4lu %4lu %4lu %5lu %10lu %9lu "
+                   "%8lu %7lu %4lu %4lu %4lu %5lu %7lu %10lu\n",
+                   dev->name, stats->rx_bytes, stats->rx_packets,
+                   stats->rx_errors,
+                   stats->rx_dropped + stats->rx_missed_errors,
+                   stats->rx_fifo_errors,
+                   stats->rx_length_errors + stats->rx_over_errors +
+                    stats->rx_crc_errors + stats->rx_frame_errors,
+                   stats->rx_compressed, stats->multicast,
+                   stats->tx_bytes, stats->tx_packets,
+                   stats->tx_errors, stats->tx_dropped,
+                   stats->tx_fifo_errors, stats->collisions,
+                   stats->tx_carrier_errors +
+                    stats->tx_aborted_errors +
+                    stats->tx_window_errors +
+                    stats->tx_heartbeat_errors,
+                   stats->tx_compressed);
 }
 
 /*
@@ -3257,11 +3254,9 @@ out:
         mutex_unlock(&net_todo_run_mutex);
 }
 
-static struct net_device_stats *maybe_internal_stats(struct net_device *dev)
+static struct net_device_stats *internal_stats(struct net_device *dev)
 {
-        if (dev->features & NETIF_F_INTERNAL_STATS)
-                return &dev->stats;
-        return NULL;
+        return &dev->stats;
 }
 
 /**
@@ -3299,7 +3294,7 @@ struct net_device *alloc_netdev(int sizeof_priv, const char *name,
         if (sizeof_priv)
                 dev->priv = netdev_priv(dev);
 
-        dev->get_stats = maybe_internal_stats;
+        dev->get_stats = internal_stats;
         setup(dev);
         strcpy(dev->name, name);
         return dev;