diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-24 15:35:18 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-24 15:35:18 +0100 |
| commit | 30c27abd28fa168d7ebd2e5286f1fe473c74bfa9 (patch) | |
| tree | 9936b38c0c81cd430d5e75906c1207d127fe588c /drivers/net/dummy.c | |
| parent | Merge tag 'ib-asoc-1' of git://git.linaro.org/people/ljones/mfd into asoc-ari... (diff) | |
| parent | Linux 3.13-rc1 (diff) | |
| download | linux-30c27abd28fa168d7ebd2e5286f1fe473c74bfa9.tar.xz linux-30c27abd28fa168d7ebd2e5286f1fe473c74bfa9.zip | |
Merge tag 'v3.13-rc1' into asoc-arizona
Linux 3.13-rc1
Diffstat (limited to 'drivers/net/dummy.c')
| -rw-r--r-- | drivers/net/dummy.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c index b710c6b2d659..bd8f84b0b894 100644 --- a/drivers/net/dummy.c +++ b/drivers/net/dummy.c @@ -88,10 +88,16 @@ static netdev_tx_t dummy_xmit(struct sk_buff *skb, struct net_device *dev) static int dummy_dev_init(struct net_device *dev) { + int i; dev->dstats = alloc_percpu(struct pcpu_dstats); if (!dev->dstats) return -ENOMEM; + for_each_possible_cpu(i) { + struct pcpu_dstats *dstats; + dstats = per_cpu_ptr(dev->dstats, i); + u64_stats_init(&dstats->syncp); + } return 0; } |