projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'sh-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
net
/
dummy.c
diff --git
a/drivers/net/dummy.c
b/drivers/net/dummy.c
index bd8f84b0b894ebfe616a85b365598347d648200f..0932ffbf381b5b5c877b9988318912fcea930473 100644
(file)
--- a/
drivers/net/dummy.c
+++ b/
drivers/net/dummy.c
@@
-63,10
+63,10
@@
static struct rtnl_link_stats64 *dummy_get_stats64(struct net_device *dev,
dstats = per_cpu_ptr(dev->dstats, i);
do {
dstats = per_cpu_ptr(dev->dstats, i);
do {
- start = u64_stats_fetch_begin_
bh
(&dstats->syncp);
+ start = u64_stats_fetch_begin_
irq
(&dstats->syncp);
tbytes = dstats->tx_bytes;
tpackets = dstats->tx_packets;
tbytes = dstats->tx_bytes;
tpackets = dstats->tx_packets;
- } while (u64_stats_fetch_retry_
bh
(&dstats->syncp, start));
+ } while (u64_stats_fetch_retry_
irq
(&dstats->syncp, start));
stats->tx_bytes += tbytes;
stats->tx_packets += tpackets;
}
stats->tx_bytes += tbytes;
stats->tx_packets += tpackets;
}
@@
-88,16
+88,10
@@
static netdev_tx_t dummy_xmit(struct sk_buff *skb, struct net_device *dev)
static int dummy_dev_init(struct net_device *dev)
{
static int dummy_dev_init(struct net_device *dev)
{
- int i;
- dev->dstats = alloc_percpu(struct pcpu_dstats);
+ dev->dstats = netdev_alloc_pcpu_stats(struct pcpu_dstats);
if (!dev->dstats)
return -ENOMEM;
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;
}
return 0;
}