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 'for-3.14' of git://linux-nfs.org/~bfields/linux
[cascardo/linux.git]
/
include
/
net
/
ip6_tunnel.h
diff --git
a/include/net/ip6_tunnel.h
b/include/net/ip6_tunnel.h
index
6d1549c
..
a5593da
100644
(file)
--- a/
include/net/ip6_tunnel.h
+++ b/
include/net/ip6_tunnel.h
@@
-79,7
+79,7
@@
static inline void ip6tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
err = ip6_local_out(skb);
if (net_xmit_eval(err) == 0) {
err = ip6_local_out(skb);
if (net_xmit_eval(err) == 0) {
- struct pcpu_tstats *tstats = this_cpu_ptr(dev->tstats);
+ struct pcpu_
sw_ne
tstats *tstats = this_cpu_ptr(dev->tstats);
u64_stats_update_begin(&tstats->syncp);
tstats->tx_bytes += pkt_len;
tstats->tx_packets++;
u64_stats_update_begin(&tstats->syncp);
tstats->tx_bytes += pkt_len;
tstats->tx_packets++;