diff mbox

batman-adv: Fix rx packet/bytes stats on local ARP reply

Message ID 20170405142617.21758-1-sven@narfation.org (mailing list archive)
State Accepted, archived
Commit 426ddde4ffe0c7345d1a7409bf899f89ddea26d3
Delegated to: Simon Wunderlich
Headers

Commit Message

Sven Eckelmann April 5, 2017, 2:26 p.m. UTC 
  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>
---
 net/batman-adv/distributed-arp-table.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 
This patch is only compile tested.

Comments

Sven Eckelmann May 19, 2017, 10:41 a.m. UTC | #1 
On Mittwoch, 5. April 2017 16:26:17 CEST Sven Eckelmann wrote:
> 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>
> ---
>  net/batman-adv/distributed-arp-table.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)

Patch applied as 426ddde4ffe0c7345d1a7409bf899f89ddea26d3 [1]

Kind regards,
	Sven

[1] https://git.open-mesh.org/batman-adv.git/commit/426ddde4ffe0c7345d1a7409bf899f89ddea26d3
diff mbox

Patch

diff --git a/net/batman-adv/distributed-arp-table.c b/net/batman-adv/distributed-arp-table.c
index 013e970..000ca2f 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, soft_iface);
 
-		soft_iface->stats.rx_packets++;
-		soft_iface->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);
 
 		netif_rx(skb_new);
 		batadv_dbg(BATADV_DBG_DAT, bat_priv, "ARP request replied locally\n");