path: root/net/ipv4/ip_tunnel_core.c
diff options
authorNicolas Dichtel <nicolas.dichtel@6wind.com>2015-09-18 11:47:40 +0200
committerDavid S. Miller <davem@davemloft.net>2015-09-20 22:36:22 -0700
commitbc22a0e2ea03b75b51a1f722f93821744b5b5ff1 (patch)
treec742810670b37ce1f35f780a6aad531bb6a69e2d /net/ipv4/ip_tunnel_core.c
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf (diff)
iptunnel: make rx/tx bytes counters consistent
This was already done a long time ago in commit 64194c31a0b6 ("inet: Make tunnel RX/TX byte counters more consistent") but tx path was broken (at least since 3.10). Before the patch the gre header was included on tx. After the patch: $ ping -c1 ; ip -s l ls dev gre1 PING ( 56(84) bytes of data. 64 bytes from icmp_req=1 ttl=64 time=2.95 ms --- ping statistics --- 1 packets transmitted, 1 received, 0% packet loss, time 0ms rtt min/avg/max/mdev = 2.955/2.955/2.955/0.000 ms 7: gre1@NONE: <POINTOPOINT,NOARP,UP,LOWER_UP> mtu 1468 qdisc noqueue state UNKNOWN mode DEFAULT group default link/gre peer RX: bytes packets errors dropped overrun mcast 84 1 0 0 0 0 TX: bytes packets errors dropped carrier collsns 84 1 0 0 0 0 Reported-by: Julien Meunier <julien.meunier@6wind.com> Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_tunnel_core.c')
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c
index 29ed6c5a5185..9b97204b8c81 100644
--- a/net/ipv4/ip_tunnel_core.c
+++ b/net/ipv4/ip_tunnel_core.c
@@ -51,7 +51,7 @@ int iptunnel_xmit(struct sock *sk, struct rtable *rt, struct sk_buff *skb,
__be32 src, __be32 dst, __u8 proto,
__u8 tos, __u8 ttl, __be16 df, bool xnet)
- int pkt_len = skb->len;
+ int pkt_len = skb->len - skb_inner_network_offset(skb);
struct iphdr *iph;
int err;