Merge v2.6.37-rc8 into powerpc/next

1 files changed, 6 insertions, 22 deletions

diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c
index 9a0996795321..2d9663a1c54d 100644
--- a/drivers/net/loopback.c
+++ b/drivers/net/loopback.c
@@ -64,7 +64,6 @@ struct pcpu_lstats {
         u64                     packets;
         u64                     bytes;
         struct u64_stats_sync   syncp;
-        unsigned long           drops;
 };
 
 /*
@@ -74,7 +73,6 @@ struct pcpu_lstats {
 static netdev_tx_t loopback_xmit(struct sk_buff *skb,
                                  struct net_device *dev)
 {
-        struct pcpu_lstats __percpu *pcpu_lstats;
         struct pcpu_lstats *lb_stats;
         int len;
 
@@ -83,8 +81,7 @@ static netdev_tx_t loopback_xmit(struct sk_buff *skb,
         skb->protocol = eth_type_trans(skb, dev);
 
         /* it's OK to use per_cpu_ptr() because BHs are off */
-        pcpu_lstats = (void __percpu __force *)dev->ml_priv;
-        lb_stats = this_cpu_ptr(pcpu_lstats);
+        lb_stats = this_cpu_ptr(dev->lstats);
 
         len = skb->len;
         if (likely(netif_rx(skb) == NET_RX_SUCCESS)) {
@@ -92,8 +89,7 @@ static netdev_tx_t loopback_xmit(struct sk_buff *skb,
                 lb_stats->bytes += len;
                 lb_stats->packets++;
                 u64_stats_update_end(&lb_stats->syncp);
-        } else
-                lb_stats->drops++;
+        }
 
         return NETDEV_TX_OK;
 }
@@ -101,32 +97,26 @@ static netdev_tx_t loopback_xmit(struct sk_buff *skb,
 static struct rtnl_link_stats64 *loopback_get_stats64(struct net_device *dev,
                                                       struct rtnl_link_stats64 *stats)
 {
-        const struct pcpu_lstats __percpu *pcpu_lstats;
         u64 bytes = 0;
         u64 packets = 0;
-        u64 drops = 0;
         int i;
 
-        pcpu_lstats = (void __percpu __force *)dev->ml_priv;
         for_each_possible_cpu(i) {
                 const struct pcpu_lstats *lb_stats;
                 u64 tbytes, tpackets;
                 unsigned int start;
 
-                lb_stats = per_cpu_ptr(pcpu_lstats, i);
+                lb_stats = per_cpu_ptr(dev->lstats, i);
                 do {
                         start = u64_stats_fetch_begin(&lb_stats->syncp);
                         tbytes = lb_stats->bytes;
                         tpackets = lb_stats->packets;
                 } while (u64_stats_fetch_retry(&lb_stats->syncp, start));
-                drops   += lb_stats->drops;
                 bytes   += tbytes;
                 packets += tpackets;
         }
         stats->rx_packets = packets;
         stats->tx_packets = packets;
-        stats->rx_dropped = drops;
-        stats->rx_errors  = drops;
         stats->rx_bytes   = bytes;
         stats->tx_bytes   = bytes;
         return stats;
@@ -147,22 +137,16 @@ static const struct ethtool_ops loopback_ethtool_ops = {
 
 static int loopback_dev_init(struct net_device *dev)
 {
-        struct pcpu_lstats __percpu *lstats;
-
-        lstats = alloc_percpu(struct pcpu_lstats);
-        if (!lstats)
+        dev->lstats = alloc_percpu(struct pcpu_lstats);
+        if (!dev->lstats)
                 return -ENOMEM;
 
-        dev->ml_priv = (void __force *)lstats;
         return 0;
 }
 
 static void loopback_dev_free(struct net_device *dev)
 {
-        struct pcpu_lstats __percpu *lstats =
-                (void __percpu __force *)dev->ml_priv;
-
-        free_percpu(lstats);
+        free_percpu(dev->lstats);
         free_netdev(dev);
 }