diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2012-02-13 01:53:41 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-02-13 15:57:31 -0500 |
commit | 58472a76cf811c40668bab20410c71f795774361 (patch) | |
tree | 4213510830620f1390941926fdd694352c36a34a /drivers | |
parent | fafdbf84d7eb2cd7aee435cc381a0796e1a5ccb0 (diff) |
virtio: net: remove sparse errors
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/virtio_net.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 4880aa8b4c28..83c503ed4ae8 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c | |||
@@ -255,7 +255,7 @@ static int receive_mergeable(struct virtnet_info *vi, struct sk_buff *skb) | |||
255 | static void receive_buf(struct net_device *dev, void *buf, unsigned int len) | 255 | static void receive_buf(struct net_device *dev, void *buf, unsigned int len) |
256 | { | 256 | { |
257 | struct virtnet_info *vi = netdev_priv(dev); | 257 | struct virtnet_info *vi = netdev_priv(dev); |
258 | struct virtnet_stats __percpu *stats = this_cpu_ptr(vi->stats); | 258 | struct virtnet_stats *stats = this_cpu_ptr(vi->stats); |
259 | struct sk_buff *skb; | 259 | struct sk_buff *skb; |
260 | struct page *page; | 260 | struct page *page; |
261 | struct skb_vnet_hdr *hdr; | 261 | struct skb_vnet_hdr *hdr; |
@@ -549,7 +549,7 @@ static unsigned int free_old_xmit_skbs(struct virtnet_info *vi) | |||
549 | { | 549 | { |
550 | struct sk_buff *skb; | 550 | struct sk_buff *skb; |
551 | unsigned int len, tot_sgs = 0; | 551 | unsigned int len, tot_sgs = 0; |
552 | struct virtnet_stats __percpu *stats = this_cpu_ptr(vi->stats); | 552 | struct virtnet_stats *stats = this_cpu_ptr(vi->stats); |
553 | 553 | ||
554 | while ((skb = virtqueue_get_buf(vi->svq, &len)) != NULL) { | 554 | while ((skb = virtqueue_get_buf(vi->svq, &len)) != NULL) { |
555 | pr_debug("Sent skb %p\n", skb); | 555 | pr_debug("Sent skb %p\n", skb); |
@@ -688,8 +688,7 @@ static struct rtnl_link_stats64 *virtnet_stats(struct net_device *dev, | |||
688 | unsigned int start; | 688 | unsigned int start; |
689 | 689 | ||
690 | for_each_possible_cpu(cpu) { | 690 | for_each_possible_cpu(cpu) { |
691 | struct virtnet_stats __percpu *stats | 691 | struct virtnet_stats *stats = per_cpu_ptr(vi->stats, cpu); |
692 | = per_cpu_ptr(vi->stats, cpu); | ||
693 | u64 tpackets, tbytes, rpackets, rbytes; | 692 | u64 tpackets, tbytes, rpackets, rbytes; |
694 | 693 | ||
695 | do { | 694 | do { |