• Nicolas Dichtel's avatar
    ip6tunnel: make rx/tx bytes counters consistent · 83cf9a25
    Nicolas Dichtel authored
    Like the previous patch, which fixes ipv4 tunnels, here is the ipv6 part.
    
    Before the patch, the external ipv6 header + gre header were included on
    tx.
    
    After the patch:
    $ ping -c1 192.168.6.121 ; ip -s l ls dev ip6gre1
    PING 192.168.6.121 (192.168.6.121) 56(84) bytes of data.
    64 bytes from 192.168.6.121: icmp_req=1 ttl=64 time=1.92 ms
    
    --- 192.168.6.121 ping statistics ---
    1 packets transmitted, 1 received, 0% packet loss, time 0ms
    rtt min/avg/max/mdev = 1.923/1.923/1.923/0.000 ms
    7: ip6gre1@NONE: <POINTOPOINT,NOARP,UP,LOWER_UP> mtu 1440 qdisc noqueue state UNKNOWN mode DEFAULT group default
        link/gre6 20:01:06:60:30:08:c1:c3:00:00:00:00:00:00:01:23 peer 20:01:06:60:30:08:c1:c3:00:00:00:00:00:00:01:21
        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
    $ ping -c1 192.168.1.121 ; ip -s l ls dev ip6tnl1
    PING 192.168.1.121 (192.168.1.121) 56(84) bytes of data.
    64 bytes from 192.168.1.121: icmp_req=1 ttl=64 time=2.28 ms
    
    --- 192.168.1.121 ping statistics ---
    1 packets transmitted, 1 received, 0% packet loss, time 0ms
    rtt min/avg/max/mdev = 2.288/2.288/2.288/0.000 ms
    8: ip6tnl1@NONE: <POINTOPOINT,NOARP,UP,LOWER_UP> mtu 1452 qdisc noqueue state UNKNOWN mode DEFAULT group default
        link/tunnel6 2001:660:3008:c1c3::123 peer 2001:660:3008:c1c3::121
        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
    Signed-off-by: default avatarNicolas Dichtel <nicolas.dichtel@6wind.com>
    Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    83cf9a25
ip6_tunnel.h 3.18 KB