]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
virtio: net: remove sparse errors
authorEric Dumazet <eric.dumazet@gmail.com>
Mon, 13 Feb 2012 06:53:41 +0000 (06:53 +0000)
committerDavid S. Miller <davem@davemloft.net>
Mon, 13 Feb 2012 20:57:31 +0000 (15:57 -0500)
commit 3fa2a1df909 (virtio-net: per cpu 64 bit stats (v2)) added extra
__percpu qualifiers and sparse errors.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Stephen Hemminger <shemminger@vyatta.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/virtio_net.c

index 4880aa8b4c28b4662446e8e56b2acc98958645e4..83c503ed4ae8ce3fef9402d0294c826b14eb9cfb 100644 (file)
@@ -255,7 +255,7 @@ static int receive_mergeable(struct virtnet_info *vi, struct sk_buff *skb)
 static void receive_buf(struct net_device *dev, void *buf, unsigned int len)
 {
        struct virtnet_info *vi = netdev_priv(dev);
-       struct virtnet_stats __percpu *stats = this_cpu_ptr(vi->stats);
+       struct virtnet_stats *stats = this_cpu_ptr(vi->stats);
        struct sk_buff *skb;
        struct page *page;
        struct skb_vnet_hdr *hdr;
@@ -549,7 +549,7 @@ static unsigned int free_old_xmit_skbs(struct virtnet_info *vi)
 {
        struct sk_buff *skb;
        unsigned int len, tot_sgs = 0;
-       struct virtnet_stats __percpu *stats = this_cpu_ptr(vi->stats);
+       struct virtnet_stats *stats = this_cpu_ptr(vi->stats);
 
        while ((skb = virtqueue_get_buf(vi->svq, &len)) != NULL) {
                pr_debug("Sent skb %p\n", skb);
@@ -688,8 +688,7 @@ static struct rtnl_link_stats64 *virtnet_stats(struct net_device *dev,
        unsigned int start;
 
        for_each_possible_cpu(cpu) {
-               struct virtnet_stats __percpu *stats
-                       = per_cpu_ptr(vi->stats, cpu);
+               struct virtnet_stats *stats = per_cpu_ptr(vi->stats, cpu);
                u64 tpackets, tbytes, rpackets, rbytes;
 
                do {