Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc883d16 authored by Frank Blaschka's avatar Frank Blaschka Committed by David S. Miller
Browse files

vlan: add neigh_setup 



In case the real device has a neigh_setup function, this
neigh_setup function should be used for the vlan device.

Signed-off-by: default avatarFrank Blaschka <frank.blaschka@de.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f52deb0e

net/8021q/vlan_dev.c

+14 −0
Original line number Original line Diff line number Diff line
@@ -546,6 +546,18 @@ static int vlan_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) 
	return err;

	return err;

}

}





static int vlan_dev_neigh_setup(struct net_device *dev, struct neigh_parms *pa)

{

	struct net_device *real_dev = vlan_dev_info(dev)->real_dev;

	const struct net_device_ops *ops = real_dev->netdev_ops;

	int err = 0;



	if (netif_device_present(real_dev) && ops->ndo_neigh_setup)

		err = ops->ndo_neigh_setup(dev, pa);



	return err;

}



static void vlan_dev_change_rx_flags(struct net_device *dev, int change)

static void vlan_dev_change_rx_flags(struct net_device *dev, int change)

{

{

	struct net_device *real_dev = vlan_dev_info(dev)->real_dev;

	struct net_device *real_dev = vlan_dev_info(dev)->real_dev;
@@ -713,6 +725,7 @@ static const struct net_device_ops vlan_netdev_ops = { 
	.ndo_set_multicast_list	= vlan_dev_set_rx_mode,

	.ndo_set_multicast_list	= vlan_dev_set_rx_mode,

	.ndo_change_rx_flags	= vlan_dev_change_rx_flags,

	.ndo_change_rx_flags	= vlan_dev_change_rx_flags,

	.ndo_do_ioctl		= vlan_dev_ioctl,

	.ndo_do_ioctl		= vlan_dev_ioctl,

	.ndo_neigh_setup	= vlan_dev_neigh_setup,

};

};





static const struct net_device_ops vlan_netdev_accel_ops = {

static const struct net_device_ops vlan_netdev_accel_ops = {
@@ -728,6 +741,7 @@ static const struct net_device_ops vlan_netdev_accel_ops = { 
	.ndo_set_multicast_list	= vlan_dev_set_rx_mode,

	.ndo_set_multicast_list	= vlan_dev_set_rx_mode,

	.ndo_change_rx_flags	= vlan_dev_change_rx_flags,

	.ndo_change_rx_flags	= vlan_dev_change_rx_flags,

	.ndo_do_ioctl		= vlan_dev_ioctl,

	.ndo_do_ioctl		= vlan_dev_ioctl,

	.ndo_neigh_setup	= vlan_dev_neigh_setup,

};

};





void vlan_setup(struct net_device *dev)

void vlan_setup(struct net_device *dev)