From patchwork Wed Jul 28 05:10:33 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changli Gao X-Patchwork-Id: 60124 X-Patchwork-Delegate: davem@davemloft.net 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 AC8B61007D3 for ; Wed, 28 Jul 2010 18:35:55 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752804Ab0G1Ifu (ORCPT ); Wed, 28 Jul 2010 04:35:50 -0400 Received: from mail-pv0-f174.google.com ([74.125.83.174]:38974 "EHLO mail-pv0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751459Ab0G1Ift (ORCPT ); Wed, 28 Jul 2010 04:35:49 -0400 Received: by pvc7 with SMTP id 7so782768pvc.19 for ; Wed, 28 Jul 2010 01:35:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=bvhwS9BhzhQxLYzquMC/QVfzziaAFAAPHif+lLHv+lU=; b=iDsoQlT1+vYTBK3ievSQZk20Zupd3AVh09usNJxlhUQx4uKpS0OoDUwkHCpfBlC6m+ zOfObJu0A3oquZQQHtQBFzcwLyTHt1WSABT4UaZxLIVyw/o3m6pgT/bDqLGYdviEWJ4R i8Rl1IQdP71INVh2ExQkri7JhM1lIgvcLaL0I= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=EcRQxTLG36iDPW9yqIpucvmQdbUnnfnNRZtO82FAnNDy2dYHEyb2BfBv+0KdtRxeQq BBvcqKVUxWO2mfc9505pKuUr9eC6zDGcAZ+swUGNBgzz4C/SzHgm1ihx+ed4YKndX+Ii 3cthIwNFRio3prlyQ/PVVYI90zEL7iFvCmVQY= Received: by 10.114.135.12 with SMTP id i12mr9556748wad.50.1280306149425; Wed, 28 Jul 2010 01:35:49 -0700 (PDT) Received: from localhost.localdomain ([221.238.105.38]) by mx.google.com with ESMTPS id n32sm10669528wag.11.2010.07.28.01.35.43 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 28 Jul 2010 01:35:48 -0700 (PDT) From: Changli Gao To: Patrick McHardy Cc: "David S. Miller" , netdev@vger.kernel.org, Changli Gao Subject: [PATCH] vlan: fix u64_stats Date: Wed, 28 Jul 2010 13:10:33 +0800 Message-Id: <1280293833-8723-1-git-send-email-xiaosuo@gmail.com> X-Mailer: git-send-email 1.7.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org rx_stats->rx_errors should be under the protection of rx_stats->syncp. Signed-off-by: Changli Gao ---- net/8021q/vlan_dev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index 3d59c9b..d70d31a 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c @@ -211,7 +211,6 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev, default: break; } - u64_stats_update_end(&rx_stats->syncp); } skb_pull_rcsum(skb, VLAN_HLEN); @@ -221,8 +220,10 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev, skb = vlan_check_reorder_header(skb); if (!skb) { rx_stats->rx_errors++; + u64_stats_update_end(&rx_stats->syncp); goto err_unlock; } + u64_stats_update_end(&rx_stats->syncp); } netif_rx(skb);