projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'pm-cpuidle'
[cascardo/linux.git]
/
drivers
/
net
/
nlmon.c
diff --git
a/drivers/net/nlmon.c
b/drivers/net/nlmon.c
index
14ce7de
..
34924df
100644
(file)
--- a/
drivers/net/nlmon.c
+++ b/
drivers/net/nlmon.c
@@
-90,10
+90,10
@@
nlmon_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats)
nl_stats = per_cpu_ptr(dev->lstats, i);
do {
nl_stats = per_cpu_ptr(dev->lstats, i);
do {
- start = u64_stats_fetch_begin_
bh
(&nl_stats->syncp);
+ start = u64_stats_fetch_begin_
irq
(&nl_stats->syncp);
tbytes = nl_stats->bytes;
tpackets = nl_stats->packets;
tbytes = nl_stats->bytes;
tpackets = nl_stats->packets;
- } while (u64_stats_fetch_retry_
bh
(&nl_stats->syncp, start));
+ } while (u64_stats_fetch_retry_
irq
(&nl_stats->syncp, start));
packets += tpackets;
bytes += tbytes;
packets += tpackets;
bytes += tbytes;
@@
-136,7
+136,8
@@
static void nlmon_setup(struct net_device *dev)
dev->ethtool_ops = &nlmon_ethtool_ops;
dev->destructor = free_netdev;
dev->ethtool_ops = &nlmon_ethtool_ops;
dev->destructor = free_netdev;
- dev->features = NETIF_F_FRAGLIST | NETIF_F_HIGHDMA;
+ dev->features = NETIF_F_SG | NETIF_F_FRAGLIST |
+ NETIF_F_HIGHDMA | NETIF_F_LLTX;
dev->flags = IFF_NOARP;
/* That's rather a softlimit here, which, of course,
dev->flags = IFF_NOARP;
/* That's rather a softlimit here, which, of course,