diff options
| author |   David S. Miller <davem@davemloft.net> | 2010-01-28 06:12:38 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-01-28 06:12:38 -0800 |
| commit | 05ba712d7eb156009753e18e5116cabd869cc6e2 (patch) | |
| tree | 1ad850d6889f6b3671a5636653940f20a7d22bdf /net/8021q | |
| parent | netdev: remove HAVE_ leftovers (diff) | |
| parent | bonding: bond_open error return value (diff) | |
| download | linux-dev-05ba712d7eb156009753e18e5116cabd869cc6e2.tar.xz linux-dev-05ba712d7eb156009753e18e5116cabd869cc6e2.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/8021q')
| -rw-r--r-- | net/8021q/vlan_dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index 77a49ffdd0ef..a9e1f1785614 100644 --- a/net/8021q/vlan_dev.c +++ b/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; |