diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2008-10-09 12:03:17 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-09 12:03:17 -0700 |
| commit | 64194c31a0b6f5d84703b772113aafc400eeaad6 (patch) | |
| tree | 68ade9b285112f8430ba29772f8318f0cb0553ed /include/net | |
| parent | e1a8000228e16212c93b23cfbed4d622e2ec7a6b (diff) | |
| download | op-kernel-dev-64194c31a0b6f5d84703b772113aafc400eeaad6.zip op-kernel-dev-64194c31a0b6f5d84703b772113aafc400eeaad6.tar.gz | |
inet: Make tunnel RX/TX byte counters more consistent
This patch makes the RX/TX byte counters for IPIP, GRE and SIT more
consistent. Previously we included the external IP headers on the
way out but not when the packet is inbound.
The new scheme is to count payload only in both directions. For
IPIP and SIT this simply means the exclusion of the external IP
header. For GRE this means that we exclude the GRE header as
well.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/ipip.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/ipip.h b/include/net/ipip.h index a85bda6..fdf9bd7 100644 --- a/include/net/ipip.h +++ b/include/net/ipip.h @@ -37,7 +37,7 @@ struct ip_tunnel_prl_entry #define IPTUNNEL_XMIT() do { \ int err; \ - int pkt_len = skb->len; \ + int pkt_len = skb->len - skb_transport_offset(skb); \ \ skb->ip_summed = CHECKSUM_NONE; \ ip_select_ident(iph, &rt->u.dst, NULL); \ |
