summaryrefslogtreecommitdiffstats
path: root/drivers/net/macvlan.c
diff options
context:
space:
mode:
authorWANG Cong <xiyou.wangcong@gmail.com>2014-02-13 14:46:28 -0500
committerDavid S. Miller <davem@davemloft.net>2014-02-14 15:49:55 -0500
commit1c213bd24ad04f4430031d20d740d7783162b099 (patch)
treeeb42b8d216e89008065634185fd6a5fcce5ec4e9 /drivers/net/macvlan.c
parented1acc8cd8c22efa919da8d300bab646e01c2dce (diff)
net: introduce netdev_alloc_pcpu_stats() for drivers
There are many drivers calling alloc_percpu() to allocate pcpu stats and then initializing ->syncp. So just introduce a helper function for them. Cc: David S. Miller <davem@davemloft.net> Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/macvlan.c')
-rw-r--r--drivers/net/macvlan.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 8433de4509c7..25685e3eb472 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -534,7 +534,6 @@ static int macvlan_init(struct net_device *dev)
534{ 534{
535 struct macvlan_dev *vlan = netdev_priv(dev); 535 struct macvlan_dev *vlan = netdev_priv(dev);
536 const struct net_device *lowerdev = vlan->lowerdev; 536 const struct net_device *lowerdev = vlan->lowerdev;
537 int i;
538 537
539 dev->state = (dev->state & ~MACVLAN_STATE_MASK) | 538 dev->state = (dev->state & ~MACVLAN_STATE_MASK) |
540 (lowerdev->state & MACVLAN_STATE_MASK); 539 (lowerdev->state & MACVLAN_STATE_MASK);
@@ -546,16 +545,10 @@ static int macvlan_init(struct net_device *dev)
546 545
547 macvlan_set_lockdep_class(dev); 546 macvlan_set_lockdep_class(dev);
548 547
549 vlan->pcpu_stats = alloc_percpu(struct vlan_pcpu_stats); 548 vlan->pcpu_stats = netdev_alloc_pcpu_stats(struct vlan_pcpu_stats);
550 if (!vlan->pcpu_stats) 549 if (!vlan->pcpu_stats)
551 return -ENOMEM; 550 return -ENOMEM;
552 551
553 for_each_possible_cpu(i) {
554 struct vlan_pcpu_stats *mvlstats;
555 mvlstats = per_cpu_ptr(vlan->pcpu_stats, i);
556 u64_stats_init(&mvlstats->syncp);
557 }
558
559 return 0; 552 return 0;
560} 553}
561 554