From patchwork Mon Dec 21 13:08:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hesse X-Patchwork-Id: 559549 X-Patchwork-Delegate: shemminger@vyatta.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id EB0521409C3 for ; Tue, 22 Dec 2015 00:17:22 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=eworm.de header.i=@eworm.de header.b=P0Kz61w+; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751282AbbLUNRS (ORCPT ); Mon, 21 Dec 2015 08:17:18 -0500 Received: from mx.mylinuxtime.de ([148.251.109.235]:40745 "EHLO mx.mylinuxtime.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751134AbbLUNRR (ORCPT ); Mon, 21 Dec 2015 08:17:17 -0500 X-Greylist: delayed 524 seconds by postgrey-1.27 at vger.kernel.org; Mon, 21 Dec 2015 08:17:17 EST Received: from leda.eworm.de (unknown [10.10.1.2]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx.mylinuxtime.de (Postfix) with ESMTPSA id 48EB22565C; Mon, 21 Dec 2015 14:08:32 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.9.2 mx.mylinuxtime.de 48EB22565C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=eworm.de; s=mail; t=1450703312; bh=em9St0Yt6191/VhE8QBcuKzhnCGUwCO1K3miqfDEWek=; h=From:To:Cc:Subject:Date; b=P0Kz61w+dYDhtrL/5p02QpqB3+qmZmvLqzuXqENrnqZLnXeCtoBW3rSyP5TzXwecb R8n40KI+u9DekDkZfF+TPYW9UhnSVng8LwoRqNpCStanikJP8f89wQOZujBDTubKdh xii4HS86/tokPoOXeztpO4dY/vvSD+qIJHLn/BPw= Received: by leda.eworm.de (Postfix, from userid 1000) id 144261022D8; Mon, 21 Dec 2015 14:08:27 +0100 (CET) From: Christian Hesse To: netdev@vger.kernel.org Cc: Christian Hesse Subject: [PATCH 1/1] use buf, not (non-existent) ptr Date: Mon, 21 Dec 2015 14:08:18 +0100 Message-Id: <1450703298-21675-1-git-send-email-list@eworm.de> X-Mailer: git-send-email 2.6.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Christian Hesse Shared code was moved to a function, but variable name has not been updated. Use buf (passed to the function) instead of ptr. This fixes regressen from upstream commit 7d6aadcd0a1dc795d72e1ab311aee333c763fe71. Signed-off-by: Christian Hesse --- ip/tunnel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ip/tunnel.c b/ip/tunnel.c index 1dd8092..39f825b 100644 --- a/ip/tunnel.c +++ b/ip/tunnel.c @@ -208,7 +208,7 @@ void tnl_print_stats(const char *buf) tx_bytes, tx_packets, tx_errs, tx_drops, tx_fifo, tx_colls, tx_carrier, rx_multi; - if (sscanf(ptr, "%lu%lu%lu%lu%lu%lu%lu%*d%lu%lu%lu%lu%lu%lu%lu", + if (sscanf(buf, "%lu%lu%lu%lu%lu%lu%lu%*d%lu%lu%lu%lu%lu%lu%lu", &rx_bytes, &rx_packets, &rx_errs, &rx_drops, &rx_fifo, &rx_frame, &rx_multi, &tx_bytes, &tx_packets, &tx_errs, &tx_drops,