From 4b01e6c97b23d4de5f19b42b685ed19d9f1707ff Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Sun, 24 Jan 2010 19:52:24 -0800
Subject: [PATCH] --- yaml --- r: 179818 b: refs/heads/master c:
 2dc85e91d05be91343033df78e4e6d99dc7ea50e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index d6bd0573f0be..1616224a606c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e071041be037eca208b62b84469a06bdfc692bea
+refs/heads/master: 2dc85e91d05be91343033df78e4e6d99dc7ea50e
diff --git a/trunk/net/8021q/vlan_dev.c b/trunk/net/8021q/vlan_dev.c
index b7889782047e..c1b92cab46c7 100644
--- a/trunk/net/8021q/vlan_dev.c
+++ b/trunk/net/8021q/vlan_dev.c
@@ -163,7 +163,7 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
 		goto err_unlock;
 	}
 
-	rx_stats = per_cpu_ptr(vlan_dev_info(dev)->vlan_rx_stats,
+	rx_stats = per_cpu_ptr(vlan_dev_info(skb->dev)->vlan_rx_stats,
 			       smp_processor_id());
 	rx_stats->rx_packets++;
 	rx_stats->rx_bytes += skb->len;