Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-omap-h63xx.git] / net / 8021q / vlan.c

diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index 8141e2dc510be6e99833cfe3ac89fbeb2afac189..b661f47bf10a0320889f22e7e1fcf7f3496b6baa 100644 (file)
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -18,21 +18,20 @@
  *             2 of the License, or (at your option) any later version.
  */
 
-#include <asm/uaccess.h> /* for copy_from_user */
 #include <linux/capability.h>
 #include <linux/module.h>
 #include <linux/netdevice.h>
 #include <linux/skbuff.h>
-#include <net/datalink.h>
-#include <linux/mm.h>
-#include <linux/in.h>
 #include <linux/init.h>
+#include <linux/rculist.h>
 #include <net/p8022.h>
 #include <net/arp.h>
 #include <linux/rtnetlink.h>
 #include <linux/notifier.h>
+#include <net/rtnetlink.h>
 #include <net/net_namespace.h>
 #include <net/netns/generic.h>
+#include <asm/uaccess.h>
 
 #include <linux/if_vlan.h>
 #include "vlan.h"
@@ -83,13 +82,12 @@ static struct vlan_group *__vlan_find_group(struct net_device *real_dev)
  *
  * Must be invoked with RCU read lock (no preempt)
  */
-struct net_device *__find_vlan_dev(struct net_device *real_dev,
-                                  unsigned short VID)
+struct net_device *__find_vlan_dev(struct net_device *real_dev, u16 vlan_id)
 {
        struct vlan_group *grp = __vlan_find_group(real_dev);
 
        if (grp)
-               return vlan_group_get_device(grp, VID);
+               return vlan_group_get_device(grp, vlan_id);
 
        return NULL;
 }
@@ -117,14 +115,14 @@ static struct vlan_group *vlan_group_alloc(struct net_device *real_dev)
        return grp;
 }
 
-static int vlan_group_prealloc_vid(struct vlan_group *vg, int vid)
+static int vlan_group_prealloc_vid(struct vlan_group *vg, u16 vlan_id)
 {
        struct net_device **array;
        unsigned int size;
 
        ASSERT_RTNL();
 
-       array = vg->vlan_devices_arrays[vid / VLAN_GROUP_ARRAY_PART_LEN];
+       array = vg->vlan_devices_arrays[vlan_id / VLAN_GROUP_ARRAY_PART_LEN];
        if (array != NULL)
                return 0;
 
@@ -133,7 +131,7 @@ static int vlan_group_prealloc_vid(struct vlan_group *vg, int vid)
        if (array == NULL)
                return -ENOBUFS;
 
-       vg->vlan_devices_arrays[vid / VLAN_GROUP_ARRAY_PART_LEN] = array;
+       vg->vlan_devices_arrays[vlan_id / VLAN_GROUP_ARRAY_PART_LEN] = array;
        return 0;
 }
 
@@ -147,7 +145,7 @@ void unregister_vlan_dev(struct net_device *dev)
        struct vlan_dev_info *vlan = vlan_dev_info(dev);
        struct net_device *real_dev = vlan->real_dev;
        struct vlan_group *grp;
-       unsigned short vlan_id = vlan->vlan_id;
+       u16 vlan_id = vlan->vlan_id;
 
        ASSERT_RTNL();
 
@@ -205,7 +203,7 @@ static void vlan_transfer_operstate(const struct net_device *dev,
        }
 }
 
-int vlan_check_real_dev(struct net_device *real_dev, unsigned short vlan_id)
+int vlan_check_real_dev(struct net_device *real_dev, u16 vlan_id)
 {
        char *name = real_dev->name;
 
@@ -242,7 +240,7 @@ 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;
+       u16 vlan_id = vlan->vlan_id;
        struct vlan_group *grp, *ngrp = NULL;
        int err;
 
@@ -295,8 +293,7 @@ out_free_group:
 /*  Attach a VLAN device to a mac address (ie Ethernet Card).
  *  Returns 0 if the device was created or a negative error code otherwise.
  */
-static int register_vlan_device(struct net_device *real_dev,
-                               unsigned short VLAN_ID)
+static int register_vlan_device(struct net_device *real_dev, u16 vlan_id)
 {
        struct net_device *new_dev;
        struct net *net = dev_net(real_dev);
@@ -304,10 +301,10 @@ static int register_vlan_device(struct net_device *real_dev,
        char name[IFNAMSIZ];
        int err;
 
-       if (VLAN_ID >= VLAN_VID_MASK)
+       if (vlan_id >= VLAN_VID_MASK)
                return -ERANGE;
 
-       err = vlan_check_real_dev(real_dev, VLAN_ID);
+       err = vlan_check_real_dev(real_dev, vlan_id);
        if (err < 0)
                return err;
 
@@ -315,26 +312,26 @@ static int register_vlan_device(struct net_device *real_dev,
        switch (vn->name_type) {
        case VLAN_NAME_TYPE_RAW_PLUS_VID:
                /* name will look like:  eth1.0005 */
-               snprintf(name, IFNAMSIZ, "%s.%.4i", real_dev->name, VLAN_ID);
+               snprintf(name, IFNAMSIZ, "%s.%.4i", real_dev->name, vlan_id);
                break;
        case VLAN_NAME_TYPE_PLUS_VID_NO_PAD:
                /* Put our vlan.VID in the name.
                 * Name will look like:  vlan5
                 */
-               snprintf(name, IFNAMSIZ, "vlan%i", VLAN_ID);
+               snprintf(name, IFNAMSIZ, "vlan%i", vlan_id);
                break;
        case VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD:
                /* Put our vlan.VID in the name.
                 * Name will look like:  eth0.5
                 */
-               snprintf(name, IFNAMSIZ, "%s.%i", real_dev->name, VLAN_ID);
+               snprintf(name, IFNAMSIZ, "%s.%i", real_dev->name, vlan_id);
                break;
        case VLAN_NAME_TYPE_PLUS_VID:
                /* Put our vlan.VID in the name.
                 * Name will look like:  vlan0005
                 */
        default:
-               snprintf(name, IFNAMSIZ, "vlan%.4i", VLAN_ID);
+               snprintf(name, IFNAMSIZ, "vlan%.4i", vlan_id);
        }
 
        new_dev = alloc_netdev(sizeof(struct vlan_dev_info), name,
@@ -349,7 +346,7 @@ static int register_vlan_device(struct net_device *real_dev,
         */
        new_dev->mtu = real_dev->mtu;
 
-       vlan_dev_info(new_dev)->vlan_id = VLAN_ID; /* 1 through VLAN_VID_MASK */
+       vlan_dev_info(new_dev)->vlan_id = vlan_id;
        vlan_dev_info(new_dev)->real_dev = real_dev;
        vlan_dev_info(new_dev)->dent = NULL;
        vlan_dev_info(new_dev)->flags = VLAN_FLAG_REORDER_HDR;
@@ -543,7 +540,6 @@ static struct notifier_block vlan_notifier_block __read_mostly = {
 static int vlan_ioctl_handler(struct net *net, void __user *arg)
 {
        int err;
-       unsigned short vid = 0;
        struct vlan_ioctl_args args;
        struct net_device *dev = NULL;
 
@@ -644,8 +640,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
 
        case GET_VLAN_VID_CMD:
                err = 0;
-               vlan_dev_get_vid(dev, &vid);
-               args.u.VID = vid;
+               args.u.VID = vlan_dev_vlan_id(dev);
                if (copy_to_user(arg, &args,
                                 sizeof(struct vlan_ioctl_args)))
                      err = -EFAULT;