---

yaml --- r: 179818 b: refs/heads/master c: 2dc85e9 h: refs/heads/master v: v3
git-mirror · Jan 25, 2010 · 4b01e6c · 4b01e6c
1 parent 58d6acd
commit 4b01e6c
Show file tree

Hide file tree

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