Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f6a8622 authored by Xin Long's avatar Xin Long Committed by David S. Miller
Browse files

ip6_tunnel: allow not to count pkts on tstats by passing dev as NULL 



A similar fix to Patch "ip_tunnel: allow not to count pkts on tstats by
setting skb's dev to NULL" is also needed by ip6_tunnel.

Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5684abf7

include/net/ip6_tunnel.h

+6 −3
Original line number Diff line number Diff line
@@ -158,9 +158,12 @@ static inline void ip6tunnel_xmit(struct sock *sk, struct sk_buff *skb, 
	memset(skb->cb, 0, sizeof(struct inet6_skb_parm));

	pkt_len = skb->len - skb_inner_network_offset(skb);

	err = ip6_local_out(dev_net(skb_dst(skb)->dev), sk, skb);



	if (dev) {

		if (unlikely(net_xmit_eval(err)))

			pkt_len = -1;

		iptunnel_xmit_stats(dev, pkt_len);

	}

}

#endif

#endif