| Message ID | 1534603428-30425-1-git-send-email-yanhaishuang@cmss.chinamobile.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | ip6_vti: simplify stats handling in vti6_xmit | expand |
From: Haishuang Yan <yanhaishuang@cmss.chinamobile.com> Date: Sat, 18 Aug 2018 22:43:48 +0800 > Same as ip_vti, use iptunnel_xmit_stats to updates stats in tunnel xmit > code path. > > Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com> Applied, thanks.
diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c index c72ae3a..65d4a80 100644 --- a/net/ipv6/ip6_vti.c +++ b/net/ipv6/ip6_vti.c @@ -503,17 +503,9 @@ static bool vti6_state_check(const struct xfrm_state *x, skb->dev = skb_dst(skb)->dev; err = dst_output(t->net, skb->sk, skb); - if (net_xmit_eval(err) == 0) { - struct pcpu_sw_netstats *tstats = this_cpu_ptr(dev->tstats); - - u64_stats_update_begin(&tstats->syncp); - tstats->tx_bytes += pkt_len; - tstats->tx_packets++; - u64_stats_update_end(&tstats->syncp); - } else { - stats->tx_errors++; - stats->tx_aborted_errors++; - } + if (net_xmit_eval(err) == 0) + err = pkt_len; + iptunnel_xmit_stats(dev, err); return 0; tx_err_link_failure:
Same as ip_vti, use iptunnel_xmit_stats to updates stats in tunnel xmit code path. Signed-off-by: Haishuang Yan <yanhaishuang@cmss.chinamobile.com> --- net/ipv6/ip6_vti.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-)