Commit e89fe42c authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[VLAN]: Move device registation to seperate function 



Move device registration and configuration of the underlying device to a
seperate function.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c1d3ee99

net/8021q/vlan.c

+47 −36
Original line number Diff line number Diff line
@@ -447,6 +447,51 @@ static int vlan_check_real_dev(struct net_device *real_dev, unsigned short vlan_ 
	return 0;

}



static int register_vlan_dev(struct net_device *dev)

{

	struct vlan_dev_info *vlan = VLAN_DEV_INFO(dev);

	struct net_device *real_dev = vlan->real_dev;

	unsigned short vlan_id = vlan->vlan_id;

	struct vlan_group *grp, *ngrp = NULL;

	int err;



	grp = __vlan_find_group(real_dev->ifindex);

	if (!grp) {

		ngrp = grp = vlan_group_alloc(real_dev->ifindex);

		if (!grp)

			return -ENOBUFS;

	}



	err = register_netdevice(dev);

	if (err < 0)

		goto out_free_group;



	/* Account for reference in struct vlan_dev_info */

	dev_hold(real_dev);



	vlan_transfer_operstate(real_dev, dev);

	linkwatch_fire_event(dev); /* _MUST_ call rfc2863_policy() */



	/* So, got the sucker initialized, now lets place

	 * it into our local structure.

	 */

	vlan_group_set_device(grp, vlan_id, dev);

	if (ngrp && real_dev->features & NETIF_F_HW_VLAN_RX)

		real_dev->vlan_rx_register(real_dev, ngrp);

	if (real_dev->features & NETIF_F_HW_VLAN_FILTER)

		real_dev->vlan_rx_add_vid(real_dev, vlan_id);



	if (vlan_proc_add_dev(dev) < 0)

		printk(KERN_WARNING "VLAN: failed to add proc entry for %s\n",

		       dev->name);

	return 0;



out_free_group:

	if (ngrp)

		vlan_group_free(ngrp);

	return err;

}



/*  Attach a VLAN device to a mac address (ie Ethernet Card).

 *  Returns the device that was created, or NULL if there was

 *  an error of some kind.
@@ -454,7 +499,6 @@ static int vlan_check_real_dev(struct net_device *real_dev, unsigned short vlan_ 
static struct net_device *register_vlan_device(struct net_device *real_dev,

					       unsigned short VLAN_ID)

{

	struct vlan_group *grp, *ngrp = NULL;

	struct net_device *new_dev;

	char name[IFNAMSIZ];
@@ -522,37 +566,8 @@ static struct net_device *register_vlan_device(struct net_device *real_dev, 
	VLAN_DEV_INFO(new_dev)->dent = NULL;

	VLAN_DEV_INFO(new_dev)->flags = 1;



#ifdef VLAN_DEBUG

	printk(VLAN_DBG "About to go find the group for idx: %i\n",

	       real_dev->ifindex);

#endif

	grp = __vlan_find_group(real_dev->ifindex);

	if (!grp) {

		ngrp = grp = vlan_group_alloc(real_dev->ifindex);

		if (!grp)

	if (register_vlan_dev(new_dev) < 0)

		goto out_free_newdev;

	}



	if (register_netdevice(new_dev))

		goto out_free_group;



	vlan_transfer_operstate(real_dev, new_dev);

	linkwatch_fire_event(new_dev); /* _MUST_ call rfc2863_policy() */



	/* So, got the sucker initialized, now lets place

	 * it into our local structure.

	 */

	if (ngrp && real_dev->features & NETIF_F_HW_VLAN_RX)

		real_dev->vlan_rx_register(real_dev, ngrp);



	vlan_group_set_device(grp, VLAN_ID, new_dev);



	if (vlan_proc_add_dev(new_dev)<0)/* create it's proc entry */

		printk(KERN_WARNING "VLAN: failed to add proc entry for %s\n",

							 new_dev->name);



	if (real_dev->features & NETIF_F_HW_VLAN_FILTER)

		real_dev->vlan_rx_add_vid(real_dev, VLAN_ID);



	/* Account for reference in struct vlan_dev_info */

	dev_hold(real_dev);
@@ -561,10 +576,6 @@ static struct net_device *register_vlan_device(struct net_device *real_dev, 
#endif

	return new_dev;



out_free_group:

	if (ngrp)

		vlan_group_free(ngrp);



out_free_newdev:

	free_netdev(new_dev);