---

yaml --- r: 214771 b: refs/heads/master c: af5ef24 h: refs/heads/master i: 214769: 1c65066 214767: 4bad590 v: v3
git-mirror · Sep 28, 2010 · 786c05b · 786c05b
1 parent 929b95a
commit 786c05b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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;