34 lines
1.5 KiB
Diff
34 lines
1.5 KiB
Diff
From: Sven Eckelmann <sven@narfation.org>
|
|
Date: Wed, 5 Apr 2017 16:26:17 +0200
|
|
Subject: batman-adv: Fix rx packet/bytes stats on local ARP reply
|
|
|
|
The stats are generated by batadv_interface_stats and must not be stored
|
|
directly in the net_device stats member variable. The batadv_priv
|
|
bat_counters information is assembled when ndo_get_stats is called. The
|
|
stats previously stored in net_device::stats is then overwritten.
|
|
|
|
The batman-adv counters must therefore be increased when an ARP packet is
|
|
answered locally via the distributed arp table.
|
|
|
|
Fixes: 75ca71d858f5 ("batman-adv: Distributed ARP Table - add snooping functions for ARP messages")
|
|
Signed-off-by: Sven Eckelmann <sven@narfation.org>
|
|
|
|
Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/426ddde4ffe0c7345d1a7409bf899f89ddea26d3
|
|
|
|
diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c
|
|
index 16216532c1d82c09337a9c5e7a4cd5b4ad3ded5d..4d982e63a3ab269e3d3b1e7a9d5f205638051603 100644
|
|
--- a/net/batman-adv/distributed-arp-table.c
|
|
+++ b/net/batman-adv/distributed-arp-table.c
|
|
@@ -1064,8 +1064,9 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv,
|
|
|
|
skb_new->protocol = eth_type_trans(skb_new,
|
|
bat_priv->soft_iface);
|
|
- bat_priv->stats.rx_packets++;
|
|
- bat_priv->stats.rx_bytes += skb->len + ETH_HLEN + hdr_size;
|
|
+ batadv_inc_counter(bat_priv, BATADV_CNT_RX);
|
|
+ batadv_add_counter(bat_priv, BATADV_CNT_RX_BYTES,
|
|
+ skb->len + ETH_HLEN + hdr_size);
|
|
bat_priv->soft_iface->last_rx = jiffies;
|
|
|
|
netif_rx(skb_new);
|