From 786c05b753331c50bbf745ee7860ccf76ee82835 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Sun, 26 Sep 2010 22:47:09 +0000
Subject: [PATCH] --- yaml --- r: 214771 b: refs/heads/master c:
 af5ef241133b602a77b682009f112e7c3f7604e5 h: refs/heads/master i:   214769:
 1c65066bfe1a049f67057c36496e947b484463f6   214767:
 4bad590d60ab6f66d412a6a930d585f555397bd6 v: v3

---
 [refs]                     | 2 +-
 trunk/net/8021q/vlan_dev.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index edb5e177218f..2d996b0345a6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d98efa84b790bdd62248eb0dfff17e9baf5c844
+refs/heads/master: af5ef241133b602a77b682009f112e7c3f7604e5
diff --git a/trunk/net/8021q/vlan_dev.c b/trunk/net/8021q/vlan_dev.c
index 94a1feddeb49..f6fbcc0f1af9 100644
--- a/trunk/net/8021q/vlan_dev.c
+++ b/trunk/net/8021q/vlan_dev.c
@@ -177,8 +177,8 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
 	} else {
 		skb->dev = vlan_dev;
 
-		rx_stats = per_cpu_ptr(vlan_dev_info(skb->dev)->vlan_rx_stats,
-					smp_processor_id());
+		rx_stats = this_cpu_ptr(vlan_dev_info(skb->dev)->vlan_rx_stats);
+
 		u64_stats_update_begin(&rx_stats->syncp);
 		rx_stats->rx_packets++;
 		rx_stats->rx_bytes += skb->len;