X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=net%2F8021q%2Fvlan_dev.c;h=1b34135cf9902e737b91475b7a02c018fc6568f5;hb=e8b374bb6c888a70530d800c9e2fcd153e2c325d;hp=4a19acd3a32ba06eaf3fbe4b80f8e5d3fe699d17;hpb=29a41e9e029d21c306e3ad6e723700348b04706a;p=mv-sheeva.git

diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index 4a19acd3a32..1b34135cf99 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -553,7 +553,7 @@ static int vlan_dev_neigh_setup(struct net_device *dev, struct neigh_parms *pa)
 	int err = 0;
 
 	if (netif_device_present(real_dev) && ops->ndo_neigh_setup)
-		err = ops->ndo_neigh_setup(dev, pa);
+		err = ops->ndo_neigh_setup(real_dev, pa);
 
 	return err;
 }
@@ -639,6 +639,7 @@ static int vlan_dev_init(struct net_device *dev)
 		dev->hard_header_len = real_dev->hard_header_len + VLAN_HLEN;
 		dev->netdev_ops         = &vlan_netdev_ops;
 	}
+	netdev_resync_ops(dev);
 
 	if (is_vlan_dev(real_dev))
 		subclass = 1;