summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Pirko <jpirko@redhat.com>2010-08-31 06:58:18 +0200
committerDavid S. Miller <davem@davemloft.net>2010-08-31 22:37:05 +0200
commit72ed62f7c9f0abe11231d073195a722ee43d6ec1 (patch)
tree7be4b4f359060c067cd6e3d419a6d2d51acd847f
parentPhonet: do not set POLLOUT in case of send buffer overflow (diff)
downloadlinux-72ed62f7c9f0abe11231d073195a722ee43d6ec1.tar.xz
linux-72ed62f7c9f0abe11231d073195a722ee43d6ec1.zip
vlan: Use vlan_dev_real_dev in vlan_hwaccel_do_receive
[patch net-next-2.6] vlan: Use vlan_dev_real_dev in vlan_hwaccel_do_receive Use helper as in other places. Signed-off-by: Jiri Pirko <jpirko@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/8021q/vlan_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c
index 3438c01bbacf..889f4ac4459a 100644
--- a/net/8021q/vlan_core.c
+++ b/net/8021q/vlan_core.c
@@ -40,7 +40,7 @@ void vlan_hwaccel_do_receive(struct sk_buff *skb)
struct net_device *dev = skb->dev;
struct vlan_rx_stats *rx_stats;
- skb->dev = vlan_dev_info(dev)->real_dev;
+ skb->dev = vlan_dev_real_dev(dev);
netif_nit_deliver(skb);
skb->dev = dev;