From patchwork Tue Jul 20 22:25:20 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 293 Return-Path: Received: from mail.gmx.net (mail.gmx.net [213.165.64.20]) by open-mesh.net (Postfix) with SMTP id C3A0415455D for ; Wed, 21 Jul 2010 00:25:33 +0200 (CEST) Received: (qmail invoked by alias); 20 Jul 2010 22:25:33 -0000 Received: from unknown (EHLO sven-desktop.lazhur.ath.cx) [89.246.211.23] by mail.gmx.net (mp060) with SMTP; 21 Jul 2010 00:25:33 +0200 X-Authenticated: #15668376 X-Provags-ID: V01U2FsdGVkX18/mTgUoL8/XSzhw+TPvcjL6lRvSdfpQzcD/oiISy yiiQld/z5M1KfT From: Sven Eckelmann To: greg@kroah.com Date: Wed, 21 Jul 2010 00:25:20 +0200 Message-Id: <1279664722-27500-2-git-send-email-sven.eckelmann@gmx.de> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1279664722-27500-1-git-send-email-sven.eckelmann@gmx.de> References: <1279664722-27500-1-git-send-email-sven.eckelmann@gmx.de> X-Y-GMX-Trusted: 0 Cc: b.a.t.m.a.n@lists.open-mesh.net Subject: [B.A.T.M.A.N.] [PATCH 1/3] Staging: batman-adv: Don't increment stats of foreign device X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Jul 2010 22:25:34 -0000 The receive hook for batman-adv ethernet frames tried to get the last device which processed the skb before us. It only used that information to update the rx_bytes and rx_packets stat of that foreign device which already has updated it using its own receive functions. Signed-off-by: Sven Eckelmann --- drivers/staging/batman-adv/hard-interface.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/drivers/staging/batman-adv/hard-interface.c b/drivers/staging/batman-adv/hard-interface.c index 5cc369c..f6345c4 100644 --- a/drivers/staging/batman-adv/hard-interface.c +++ b/drivers/staging/batman-adv/hard-interface.c @@ -442,7 +442,6 @@ int batman_skb_recv(struct sk_buff *skb, struct net_device *dev, struct bat_priv *bat_priv = netdev_priv(soft_device); struct batman_packet *batman_packet; struct batman_if *batman_if; - struct net_device_stats *stats; int ret; skb = skb_share_check(skb, GFP_ATOMIC); @@ -478,12 +477,6 @@ int batman_skb_recv(struct sk_buff *skb, struct net_device *dev, if (batman_if->if_status != IF_ACTIVE) goto err_free; - stats = (struct net_device_stats *)dev_get_stats(skb->dev); - if (stats) { - stats->rx_packets++; - stats->rx_bytes += skb->len; - } - batman_packet = (struct batman_packet *)skb->data; if (batman_packet->version != COMPAT_VERSION) {