Commit a9142847 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-stats-helpers' 



Li Zetao says:

====================
Use helper functions to update stats

The patch set uses the helper functions dev_sw_netstats_rx_add() and
dev_sw_netstats_tx_add() to update stats, which is the same as
implementing the function separately.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 54f00cce 3c0930b4

drivers/net/macsec.c

+3 −14
Original line number Diff line number Diff line
@@ -518,14 +518,8 @@ static void macsec_count_tx(struct sk_buff *skb, struct macsec_tx_sc *tx_sc, 


static void count_tx(struct net_device *dev, int ret, int len)

{

	if (likely(ret == NET_XMIT_SUCCESS || ret == NET_XMIT_CN)) {

		struct pcpu_sw_netstats *stats = this_cpu_ptr(dev->tstats);



		u64_stats_update_begin(&stats->syncp);

		u64_stats_inc(&stats->tx_packets);

		u64_stats_add(&stats->tx_bytes, len);

		u64_stats_update_end(&stats->syncp);

	}

	if (likely(ret == NET_XMIT_SUCCESS || ret == NET_XMIT_CN))

		dev_sw_netstats_tx_add(dev, 1, len);

}



static void macsec_encrypt_done(void *data, int err)
@@ -827,12 +821,7 @@ static void macsec_finalize_skb(struct sk_buff *skb, u8 icv_len, u8 hdr_len) 


static void count_rx(struct net_device *dev, int len)

{

	struct pcpu_sw_netstats *stats = this_cpu_ptr(dev->tstats);



	u64_stats_update_begin(&stats->syncp);

	u64_stats_inc(&stats->rx_packets);

	u64_stats_add(&stats->rx_bytes, len);

	u64_stats_update_end(&stats->syncp);

	dev_sw_netstats_rx_add(dev, len);

}



static void macsec_decrypt_done(void *data, int err)

drivers/net/vxlan/vxlan_core.c

+2 −11
Original line number Diff line number Diff line
@@ -2328,14 +2328,11 @@ static void vxlan_encap_bypass(struct sk_buff *skb, struct vxlan_dev *src_vxlan, 
			       struct vxlan_dev *dst_vxlan, __be32 vni,

			       bool snoop)

{

	struct pcpu_sw_netstats *tx_stats, *rx_stats;

	union vxlan_addr loopback;

	union vxlan_addr *remote_ip = &dst_vxlan->default_dst.remote_ip;

	struct net_device *dev;

	int len = skb->len;



	tx_stats = this_cpu_ptr(src_vxlan->dev->tstats);

	rx_stats = this_cpu_ptr(dst_vxlan->dev->tstats);

	skb->pkt_type = PACKET_HOST;

	skb->encapsulation = 0;

	skb->dev = dst_vxlan->dev;
@@ -2361,17 +2358,11 @@ static void vxlan_encap_bypass(struct sk_buff *skb, struct vxlan_dev *src_vxlan, 
	if ((dst_vxlan->cfg.flags & VXLAN_F_LEARN) && snoop)

		vxlan_snoop(dev, &loopback, eth_hdr(skb)->h_source, 0, vni);



	u64_stats_update_begin(&tx_stats->syncp);

	u64_stats_inc(&tx_stats->tx_packets);

	u64_stats_add(&tx_stats->tx_bytes, len);

	u64_stats_update_end(&tx_stats->syncp);

	dev_sw_netstats_tx_add(src_vxlan->dev, 1, len);

	vxlan_vnifilter_count(src_vxlan, vni, NULL, VXLAN_VNI_STATS_TX, len);



	if (__netif_rx(skb) == NET_RX_SUCCESS) {

		u64_stats_update_begin(&rx_stats->syncp);

		u64_stats_inc(&rx_stats->rx_packets);

		u64_stats_add(&rx_stats->rx_bytes, len);

		u64_stats_update_end(&rx_stats->syncp);

		dev_sw_netstats_rx_add(dst_vxlan->dev, len);

		vxlan_vnifilter_count(dst_vxlan, vni, NULL, VXLAN_VNI_STATS_RX,

				      len);

	} else {