From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 650E8C4332B for ; Thu, 19 Mar 2020 13:37:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3087020789 for ; Thu, 19 Mar 2020 13:37:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584625023; bh=zvdROPGXwE6jSyDE34oGLKA8ElpMJVTPNcFetGy8UJc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=TDMYjysL3AnoXm3/viMCVqVbHSByhRcxOEB6ofrJs9AhRQtwB/UNUX6wG+UZBy9ot iaSDNR1t0mrXu3NubkJJClUXU+K+AvvRIwUmDh0JWTh/Il/llUu/E5fRc27iKeEryn dc4qjH/ki10AH7c0L8VZSq79QqZoM529GrfYvG9w= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728179AbgCSNIf (ORCPT ); Thu, 19 Mar 2020 09:08:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:52796 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728173AbgCSNIe (ORCPT ); Thu, 19 Mar 2020 09:08:34 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 496B720789; Thu, 19 Mar 2020 13:08:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584623313; bh=zvdROPGXwE6jSyDE34oGLKA8ElpMJVTPNcFetGy8UJc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yjSITRJQxUQW90Iufq/BzXhMFXlLvJzy3tGGV/d5feitM0h9QaaVFhRNSG68xB/sh vbM+pCijL2o4miaF8bCxqoxVeE5E9+PGYMA0d/rQyx4vyUWzbeHRgKKv1Zu7YAvNdt 672FjBSw+4OTop0xYvqf8Vc7sjA7o7ECOSQze+ZQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Greg Kroah-Hartman , Sven Eckelmann , Simon Wunderlich Subject: [PATCH 4.4 64/93] batman-adv: Fix rx packet/bytes stats on local ARP reply Date: Thu, 19 Mar 2020 14:00:08 +0100 Message-Id: <20200319123945.252637221@linuxfoundation.org> X-Mailer: git-send-email 2.25.2 In-Reply-To: <20200319123924.795019515@linuxfoundation.org> References: <20200319123924.795019515@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Sven Eckelmann commit 36d4d68cd658d914ef73ac845705c4a89e7d9e2f upstream. 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: c384ea3ec930 ("batman-adv: Distributed ARP Table - add snooping functions for ARP messages") Signed-off-by: Sven Eckelmann Signed-off-by: Simon Wunderlich Signed-off-by: Sven Eckelmann Signed-off-by: Greg Kroah-Hartman --- net/batman-adv/distributed-arp-table.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@ -1003,8 +1003,9 @@ bool batadv_dat_snoop_outgoing_arp_reque skb_reset_mac_header(skb_new); 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);