2005-04-16 18:20:36 -04:00
|
|
|
/*
|
|
|
|
* INET 802.1Q VLAN
|
|
|
|
* Ethernet-type device handling.
|
|
|
|
*
|
|
|
|
* Authors: Ben Greear <greearb@candelatech.com>
|
2008-01-21 03:27:00 -05:00
|
|
|
* Please send support related email to: netdev@vger.kernel.org
|
2005-04-16 18:20:36 -04:00
|
|
|
* VLAN Home Page: http://www.candelatech.com/~greear/vlan.html
|
2007-02-09 09:24:25 -05:00
|
|
|
*
|
2005-04-16 18:20:36 -04:00
|
|
|
* Fixes:
|
|
|
|
* Fix for packet capture - Nick Eggleston <nick@dccinc.com>;
|
|
|
|
* Add HW acceleration hooks - David S. Miller <davem@redhat.com>;
|
|
|
|
* Correct all the locking - David S. Miller <davem@redhat.com>;
|
|
|
|
* Use hash table for VLAN groups - David S. Miller <davem@redhat.com>
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* as published by the Free Software Foundation; either version
|
|
|
|
* 2 of the License, or (at your option) any later version.
|
|
|
|
*/
|
|
|
|
|
2011-05-26 06:58:31 -04:00
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
|
2006-01-11 15:17:47 -05:00
|
|
|
#include <linux/capability.h>
|
2005-04-16 18:20:36 -04:00
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/netdevice.h>
|
|
|
|
#include <linux/skbuff.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 04:04:11 -04:00
|
|
|
#include <linux/slab.h>
|
2005-04-16 18:20:36 -04:00
|
|
|
#include <linux/init.h>
|
2008-05-12 15:21:05 -04:00
|
|
|
#include <linux/rculist.h>
|
2005-04-16 18:20:36 -04:00
|
|
|
#include <net/p8022.h>
|
|
|
|
#include <net/arp.h>
|
|
|
|
#include <linux/rtnetlink.h>
|
|
|
|
#include <linux/notifier.h>
|
2008-07-15 01:51:55 -04:00
|
|
|
#include <net/rtnetlink.h>
|
2007-09-12 07:02:17 -04:00
|
|
|
#include <net/net_namespace.h>
|
2008-04-16 03:49:09 -04:00
|
|
|
#include <net/netns/generic.h>
|
2008-07-15 01:51:55 -04:00
|
|
|
#include <asm/uaccess.h>
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
#include <linux/if_vlan.h>
|
|
|
|
#include "vlan.h"
|
|
|
|
#include "vlanproc.h"
|
|
|
|
|
|
|
|
#define DRV_VERSION "1.8"
|
|
|
|
|
|
|
|
/* Global VLAN variables */
|
|
|
|
|
2009-11-17 05:42:49 -05:00
|
|
|
int vlan_net_id __read_mostly;
|
2008-04-16 03:49:09 -04:00
|
|
|
|
2008-10-29 01:12:36 -04:00
|
|
|
const char vlan_fullname[] = "802.1Q VLAN Support";
|
|
|
|
const char vlan_version[] = DRV_VERSION;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
/* End of global variables definitions. */
|
|
|
|
|
2008-07-08 06:24:44 -04:00
|
|
|
static int vlan_group_prealloc_vid(struct vlan_group *vg, u16 vlan_id)
|
2008-03-26 19:27:22 -04:00
|
|
|
{
|
|
|
|
struct net_device **array;
|
|
|
|
unsigned int size;
|
|
|
|
|
|
|
|
ASSERT_RTNL();
|
|
|
|
|
2008-07-08 06:24:44 -04:00
|
|
|
array = vg->vlan_devices_arrays[vlan_id / VLAN_GROUP_ARRAY_PART_LEN];
|
2008-03-26 19:27:22 -04:00
|
|
|
if (array != NULL)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
size = sizeof(struct net_device *) * VLAN_GROUP_ARRAY_PART_LEN;
|
|
|
|
array = kzalloc(size, GFP_KERNEL);
|
|
|
|
if (array == NULL)
|
|
|
|
return -ENOBUFS;
|
|
|
|
|
2008-07-08 06:24:44 -04:00
|
|
|
vg->vlan_devices_arrays[vlan_id / VLAN_GROUP_ARRAY_PART_LEN] = array;
|
2008-03-26 19:27:22 -04:00
|
|
|
return 0;
|
2007-06-13 15:05:59 -04:00
|
|
|
}
|
|
|
|
|
2009-10-27 03:06:36 -04:00
|
|
|
void unregister_vlan_dev(struct net_device *dev, struct list_head *head)
|
2005-04-16 18:20:36 -04:00
|
|
|
{
|
2011-12-07 23:11:15 -05:00
|
|
|
struct vlan_dev_priv *vlan = vlan_dev_priv(dev);
|
2008-01-21 03:25:50 -05:00
|
|
|
struct net_device *real_dev = vlan->real_dev;
|
2011-12-07 23:11:18 -05:00
|
|
|
struct vlan_info *vlan_info;
|
2005-04-16 18:20:36 -04:00
|
|
|
struct vlan_group *grp;
|
2008-07-08 06:24:44 -04:00
|
|
|
u16 vlan_id = vlan->vlan_id;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
ASSERT_RTNL();
|
2008-01-21 03:25:31 -05:00
|
|
|
|
2011-12-07 23:11:18 -05:00
|
|
|
vlan_info = rtnl_dereference(real_dev->vlan_info);
|
|
|
|
BUG_ON(!vlan_info);
|
|
|
|
|
|
|
|
grp = &vlan_info->grp;
|
2008-01-21 03:25:31 -05:00
|
|
|
|
|
|
|
/* Take it out of our own structures, but be sure to interlock with
|
vlan_dev: VLAN 0 should be treated as "no vlan tag" (802.1p packet)
- Without the 8021q module loaded in the kernel, all 802.1p packets
(VLAN 0 but QoS tagging) are silently discarded (as expected, as
the protocol is not loaded).
- Without this patch in 8021q module, these packets are forwarded to
the module, but they are discarded also if VLAN 0 is not configured,
which should not be the default behaviour, as VLAN 0 is not really
a VLANed packet but a 802.1p packet. Defining VLAN 0 makes it almost
impossible to communicate with mixed 802.1p and non 802.1p devices on
the same network due to arp table issues.
- Changed logic to skip vlan specific code in vlan_skb_recv if VLAN
is 0 and we have not defined a VLAN with ID 0, but we accept the
packet with the encapsulated proto and pass it later to netif_rx.
- In the vlan device event handler, added some logic to add VLAN 0
to HW filter in devices that support it (this prevented any traffic
in VLAN 0 to reach the stack in e1000e with HW filter under 2.6.35,
and probably also with other HW filtered cards, so we fix it here).
- In the vlan unregister logic, prevent the elimination of VLAN 0
in devices with HW filter.
- The default behaviour is to ignore the VLAN 0 tagging and accept
the packet as if it was not tagged, but we can still define a
VLAN 0 if desired (so it is backwards compatible).
Signed-off-by: Pedro Garcia <pedro.netdev@dondevamos.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-07-18 18:38:44 -04:00
|
|
|
* HW accelerating devices or SW vlan input packet processing if
|
|
|
|
* VLAN is not 0 (leave it there for 802.1p).
|
2008-01-21 03:25:31 -05:00
|
|
|
*/
|
2011-12-07 23:11:17 -05:00
|
|
|
if (vlan_id)
|
|
|
|
vlan_vid_del(real_dev, vlan_id);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
2011-12-07 23:11:18 -05:00
|
|
|
grp->nr_vlan_devs--;
|
2008-01-21 03:25:31 -05:00
|
|
|
|
2011-05-10 15:22:54 -04:00
|
|
|
if (vlan->flags & VLAN_FLAG_GVRP)
|
|
|
|
vlan_gvrp_request_leave(dev);
|
|
|
|
|
2009-10-30 02:43:00 -04:00
|
|
|
vlan_group_set_device(grp, vlan_id, NULL);
|
2011-05-09 00:40:44 -04:00
|
|
|
/* Because unregister_netdevice_queue() makes sure at least one rcu
|
|
|
|
* grace period is respected before device freeing,
|
|
|
|
* we dont need to call synchronize_net() here.
|
|
|
|
*/
|
2009-10-27 03:06:36 -04:00
|
|
|
unregister_netdevice_queue(dev, head);
|
2008-07-06 00:26:41 -04:00
|
|
|
|
2011-12-07 23:11:18 -05:00
|
|
|
if (grp->nr_vlan_devs == 0)
|
2008-07-06 00:26:57 -04:00
|
|
|
vlan_gvrp_uninit_applicant(real_dev);
|
|
|
|
|
2008-01-21 03:25:50 -05:00
|
|
|
/* Get rid of the vlan's reference to real_dev */
|
|
|
|
dev_put(real_dev);
|
2005-04-16 18:20:36 -04:00
|
|
|
}
|
|
|
|
|
2008-07-08 06:24:44 -04:00
|
|
|
int vlan_check_real_dev(struct net_device *real_dev, u16 vlan_id)
|
2005-04-16 18:20:36 -04:00
|
|
|
{
|
2008-11-20 00:53:47 -05:00
|
|
|
const char *name = real_dev->name;
|
|
|
|
const struct net_device_ops *ops = real_dev->netdev_ops;
|
2008-01-21 03:24:30 -05:00
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
if (real_dev->features & NETIF_F_VLAN_CHALLENGED) {
|
2011-05-26 06:58:31 -04:00
|
|
|
pr_info("VLANs not supported on %s\n", name);
|
2007-06-13 15:06:14 -04:00
|
|
|
return -EOPNOTSUPP;
|
2005-04-16 18:20:36 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
if ((real_dev->features & NETIF_F_HW_VLAN_FILTER) &&
|
2008-11-20 00:53:47 -05:00
|
|
|
(!ops->ndo_vlan_rx_add_vid || !ops->ndo_vlan_rx_kill_vid)) {
|
2011-05-26 06:58:31 -04:00
|
|
|
pr_info("Device %s has buggy VLAN hw accel\n", name);
|
2007-06-13 15:06:14 -04:00
|
|
|
return -EOPNOTSUPP;
|
2005-04-16 18:20:36 -04:00
|
|
|
}
|
|
|
|
|
2010-10-20 09:56:05 -04:00
|
|
|
if (vlan_find_dev(real_dev, vlan_id) != NULL)
|
2007-06-13 15:06:14 -04:00
|
|
|
return -EEXIST;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
2007-06-13 15:06:14 -04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-06-13 15:07:54 -04:00
|
|
|
int register_vlan_dev(struct net_device *dev)
|
2007-06-13 15:06:29 -04:00
|
|
|
{
|
2011-12-07 23:11:15 -05:00
|
|
|
struct vlan_dev_priv *vlan = vlan_dev_priv(dev);
|
2007-06-13 15:06:29 -04:00
|
|
|
struct net_device *real_dev = vlan->real_dev;
|
2008-07-08 06:24:44 -04:00
|
|
|
u16 vlan_id = vlan->vlan_id;
|
2011-12-07 23:11:18 -05:00
|
|
|
struct vlan_info *vlan_info;
|
|
|
|
struct vlan_group *grp;
|
2007-06-13 15:06:29 -04:00
|
|
|
int err;
|
|
|
|
|
2011-12-07 23:11:18 -05:00
|
|
|
err = vlan_vid_add(real_dev, vlan_id);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
vlan_info = rtnl_dereference(real_dev->vlan_info);
|
|
|
|
/* vlan_info should be there now. vlan_vid_add took care of it */
|
|
|
|
BUG_ON(!vlan_info);
|
|
|
|
|
|
|
|
grp = &vlan_info->grp;
|
|
|
|
if (grp->nr_vlan_devs == 0) {
|
2008-07-06 00:26:57 -04:00
|
|
|
err = vlan_gvrp_init_applicant(real_dev);
|
|
|
|
if (err < 0)
|
2011-12-07 23:11:18 -05:00
|
|
|
goto out_vid_del;
|
2007-06-13 15:06:29 -04:00
|
|
|
}
|
|
|
|
|
2008-03-26 19:27:22 -04:00
|
|
|
err = vlan_group_prealloc_vid(grp, vlan_id);
|
|
|
|
if (err < 0)
|
2008-07-06 00:26:57 -04:00
|
|
|
goto out_uninit_applicant;
|
2008-03-26 19:27:22 -04:00
|
|
|
|
2007-06-13 15:06:29 -04:00
|
|
|
err = register_netdevice(dev);
|
|
|
|
if (err < 0)
|
2008-07-06 00:26:57 -04:00
|
|
|
goto out_uninit_applicant;
|
2007-06-13 15:06:29 -04:00
|
|
|
|
2011-12-07 23:11:15 -05:00
|
|
|
/* Account for reference in struct vlan_dev_priv */
|
2007-06-13 15:06:29 -04:00
|
|
|
dev_hold(real_dev);
|
|
|
|
|
2009-12-03 18:59:22 -05:00
|
|
|
netif_stacked_transfer_operstate(real_dev, dev);
|
2007-06-13 15:06:29 -04:00
|
|
|
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);
|
2011-12-07 23:11:18 -05:00
|
|
|
grp->nr_vlan_devs++;
|
2007-06-13 15:06:29 -04:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
2008-07-06 00:26:57 -04:00
|
|
|
out_uninit_applicant:
|
2011-12-07 23:11:18 -05:00
|
|
|
if (grp->nr_vlan_devs == 0)
|
2008-07-06 00:26:57 -04:00
|
|
|
vlan_gvrp_uninit_applicant(real_dev);
|
2011-12-07 23:11:18 -05:00
|
|
|
out_vid_del:
|
|
|
|
vlan_vid_del(real_dev, vlan_id);
|
2007-06-13 15:06:29 -04:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2007-06-13 15:06:14 -04:00
|
|
|
/* Attach a VLAN device to a mac address (ie Ethernet Card).
|
2007-06-13 15:06:43 -04:00
|
|
|
* Returns 0 if the device was created or a negative error code otherwise.
|
2007-06-13 15:06:14 -04:00
|
|
|
*/
|
2008-07-08 06:24:44 -04:00
|
|
|
static int register_vlan_device(struct net_device *real_dev, u16 vlan_id)
|
2007-06-13 15:06:14 -04:00
|
|
|
{
|
|
|
|
struct net_device *new_dev;
|
2008-04-16 03:54:39 -04:00
|
|
|
struct net *net = dev_net(real_dev);
|
|
|
|
struct vlan_net *vn = net_generic(net, vlan_net_id);
|
2007-06-13 15:06:14 -04:00
|
|
|
char name[IFNAMSIZ];
|
2007-06-13 15:06:43 -04:00
|
|
|
int err;
|
2007-06-13 15:06:14 -04:00
|
|
|
|
2008-07-08 06:24:44 -04:00
|
|
|
if (vlan_id >= VLAN_VID_MASK)
|
2007-06-13 15:06:43 -04:00
|
|
|
return -ERANGE;
|
2007-06-13 15:06:14 -04:00
|
|
|
|
2008-07-08 06:24:44 -04:00
|
|
|
err = vlan_check_real_dev(real_dev, vlan_id);
|
2007-06-13 15:06:43 -04:00
|
|
|
if (err < 0)
|
|
|
|
return err;
|
2007-06-13 15:06:14 -04:00
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
/* Gotta set up the fields for the device. */
|
2008-04-16 03:54:39 -04:00
|
|
|
switch (vn->name_type) {
|
2005-04-16 18:20:36 -04:00
|
|
|
case VLAN_NAME_TYPE_RAW_PLUS_VID:
|
|
|
|
/* name will look like: eth1.0005 */
|
2008-07-08 06:24:44 -04:00
|
|
|
snprintf(name, IFNAMSIZ, "%s.%.4i", real_dev->name, vlan_id);
|
2005-04-16 18:20:36 -04:00
|
|
|
break;
|
|
|
|
case VLAN_NAME_TYPE_PLUS_VID_NO_PAD:
|
|
|
|
/* Put our vlan.VID in the name.
|
|
|
|
* Name will look like: vlan5
|
|
|
|
*/
|
2008-07-08 06:24:44 -04:00
|
|
|
snprintf(name, IFNAMSIZ, "vlan%i", vlan_id);
|
2005-04-16 18:20:36 -04:00
|
|
|
break;
|
|
|
|
case VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD:
|
|
|
|
/* Put our vlan.VID in the name.
|
|
|
|
* Name will look like: eth0.5
|
|
|
|
*/
|
2008-07-08 06:24:44 -04:00
|
|
|
snprintf(name, IFNAMSIZ, "%s.%i", real_dev->name, vlan_id);
|
2005-04-16 18:20:36 -04:00
|
|
|
break;
|
|
|
|
case VLAN_NAME_TYPE_PLUS_VID:
|
|
|
|
/* Put our vlan.VID in the name.
|
|
|
|
* Name will look like: vlan0005
|
|
|
|
*/
|
|
|
|
default:
|
2008-07-08 06:24:44 -04:00
|
|
|
snprintf(name, IFNAMSIZ, "vlan%.4i", vlan_id);
|
2007-04-20 20:09:22 -04:00
|
|
|
}
|
2007-02-09 09:24:25 -05:00
|
|
|
|
2011-12-07 23:11:15 -05:00
|
|
|
new_dev = alloc_netdev(sizeof(struct vlan_dev_priv), name, vlan_setup);
|
2006-07-03 03:25:33 -04:00
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
if (new_dev == NULL)
|
2007-06-13 15:06:43 -04:00
|
|
|
return -ENOBUFS;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
2008-04-16 03:55:06 -04:00
|
|
|
dev_net_set(new_dev, net);
|
2005-04-16 18:20:36 -04:00
|
|
|
/* need 4 bytes for extra VLAN header info,
|
|
|
|
* hope the underlying device can handle it.
|
|
|
|
*/
|
|
|
|
new_dev->mtu = real_dev->mtu;
|
|
|
|
|
2011-12-07 23:11:15 -05:00
|
|
|
vlan_dev_priv(new_dev)->vlan_id = vlan_id;
|
|
|
|
vlan_dev_priv(new_dev)->real_dev = real_dev;
|
|
|
|
vlan_dev_priv(new_dev)->dent = NULL;
|
|
|
|
vlan_dev_priv(new_dev)->flags = VLAN_FLAG_REORDER_HDR;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
2007-06-13 15:07:54 -04:00
|
|
|
new_dev->rtnl_link_ops = &vlan_link_ops;
|
2007-06-13 15:06:43 -04:00
|
|
|
err = register_vlan_dev(new_dev);
|
|
|
|
if (err < 0)
|
2007-06-13 15:06:29 -04:00
|
|
|
goto out_free_newdev;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
2007-06-13 15:06:43 -04:00
|
|
|
return 0;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
out_free_newdev:
|
|
|
|
free_netdev(new_dev);
|
2007-06-13 15:06:43 -04:00
|
|
|
return err;
|
2005-04-16 18:20:36 -04:00
|
|
|
}
|
|
|
|
|
2007-07-11 22:45:24 -04:00
|
|
|
static void vlan_sync_address(struct net_device *dev,
|
|
|
|
struct net_device *vlandev)
|
|
|
|
{
|
2011-12-07 23:11:15 -05:00
|
|
|
struct vlan_dev_priv *vlan = vlan_dev_priv(vlandev);
|
2007-07-11 22:45:24 -04:00
|
|
|
|
|
|
|
/* May be called without an actual change */
|
8021q: Convert compare_ether_addr to ether_addr_equal
Use the new bool function ether_addr_equal to add
some clarity and reduce the likelihood for misuse
of compare_ether_addr for sorting.
Done via cocci script:
$ cat compare_ether_addr.cocci
@@
expression a,b;
@@
- !compare_ether_addr(a, b)
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- compare_ether_addr(a, b)
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- !ether_addr_equal(a, b) == 0
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- !ether_addr_equal(a, b) != 0
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- ether_addr_equal(a, b) == 0
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- ether_addr_equal(a, b) != 0
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- !!ether_addr_equal(a, b)
+ ether_addr_equal(a, b)
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2012-05-08 14:56:47 -04:00
|
|
|
if (ether_addr_equal(vlan->real_dev_addr, dev->dev_addr))
|
2007-07-11 22:45:24 -04:00
|
|
|
return;
|
|
|
|
|
|
|
|
/* vlan address was different from the old address and is equal to
|
|
|
|
* the new address */
|
8021q: Convert compare_ether_addr to ether_addr_equal
Use the new bool function ether_addr_equal to add
some clarity and reduce the likelihood for misuse
of compare_ether_addr for sorting.
Done via cocci script:
$ cat compare_ether_addr.cocci
@@
expression a,b;
@@
- !compare_ether_addr(a, b)
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- compare_ether_addr(a, b)
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- !ether_addr_equal(a, b) == 0
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- !ether_addr_equal(a, b) != 0
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- ether_addr_equal(a, b) == 0
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- ether_addr_equal(a, b) != 0
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- !!ether_addr_equal(a, b)
+ ether_addr_equal(a, b)
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2012-05-08 14:56:47 -04:00
|
|
|
if (!ether_addr_equal(vlandev->dev_addr, vlan->real_dev_addr) &&
|
|
|
|
ether_addr_equal(vlandev->dev_addr, dev->dev_addr))
|
2010-04-01 17:22:09 -04:00
|
|
|
dev_uc_del(dev, vlandev->dev_addr);
|
2007-07-11 22:45:24 -04:00
|
|
|
|
|
|
|
/* vlan address was equal to the old address and is different from
|
|
|
|
* the new address */
|
8021q: Convert compare_ether_addr to ether_addr_equal
Use the new bool function ether_addr_equal to add
some clarity and reduce the likelihood for misuse
of compare_ether_addr for sorting.
Done via cocci script:
$ cat compare_ether_addr.cocci
@@
expression a,b;
@@
- !compare_ether_addr(a, b)
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- compare_ether_addr(a, b)
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- !ether_addr_equal(a, b) == 0
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- !ether_addr_equal(a, b) != 0
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- ether_addr_equal(a, b) == 0
+ !ether_addr_equal(a, b)
@@
expression a,b;
@@
- ether_addr_equal(a, b) != 0
+ ether_addr_equal(a, b)
@@
expression a,b;
@@
- !!ether_addr_equal(a, b)
+ ether_addr_equal(a, b)
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2012-05-08 14:56:47 -04:00
|
|
|
if (ether_addr_equal(vlandev->dev_addr, vlan->real_dev_addr) &&
|
|
|
|
!ether_addr_equal(vlandev->dev_addr, dev->dev_addr))
|
2010-04-01 17:22:09 -04:00
|
|
|
dev_uc_add(dev, vlandev->dev_addr);
|
2007-07-11 22:45:24 -04:00
|
|
|
|
|
|
|
memcpy(vlan->real_dev_addr, dev->dev_addr, ETH_ALEN);
|
|
|
|
}
|
|
|
|
|
2008-05-20 17:54:50 -04:00
|
|
|
static void vlan_transfer_features(struct net_device *dev,
|
|
|
|
struct net_device *vlandev)
|
|
|
|
{
|
2008-09-11 23:17:05 -04:00
|
|
|
vlandev->gso_max_size = dev->gso_max_size;
|
2010-10-30 10:22:32 -04:00
|
|
|
|
|
|
|
if (dev->features & NETIF_F_HW_VLAN_TX)
|
|
|
|
vlandev->hard_header_len = dev->hard_header_len;
|
|
|
|
else
|
|
|
|
vlandev->hard_header_len = dev->hard_header_len + VLAN_HLEN;
|
|
|
|
|
2009-08-14 08:41:07 -04:00
|
|
|
#if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
|
|
|
|
vlandev->fcoe_ddp_xid = dev->fcoe_ddp_xid;
|
|
|
|
#endif
|
2011-04-03 01:49:12 -04:00
|
|
|
|
|
|
|
netdev_update_features(vlandev);
|
2008-05-20 17:54:50 -04:00
|
|
|
}
|
|
|
|
|
2008-04-02 03:08:01 -04:00
|
|
|
static void __vlan_device_event(struct net_device *dev, unsigned long event)
|
|
|
|
{
|
|
|
|
switch (event) {
|
|
|
|
case NETDEV_CHANGENAME:
|
|
|
|
vlan_proc_rem_dev(dev);
|
|
|
|
if (vlan_proc_add_dev(dev) < 0)
|
2011-05-26 06:58:31 -04:00
|
|
|
pr_warn("failed to change proc name for %s\n",
|
|
|
|
dev->name);
|
2008-04-02 03:08:01 -04:00
|
|
|
break;
|
2008-04-16 03:57:01 -04:00
|
|
|
case NETDEV_REGISTER:
|
|
|
|
if (vlan_proc_add_dev(dev) < 0)
|
2011-05-26 06:58:31 -04:00
|
|
|
pr_warn("failed to add proc entry for %s\n", dev->name);
|
2008-04-16 03:57:01 -04:00
|
|
|
break;
|
|
|
|
case NETDEV_UNREGISTER:
|
|
|
|
vlan_proc_rem_dev(dev);
|
|
|
|
break;
|
2008-04-02 03:08:01 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-01-21 03:26:41 -05:00
|
|
|
static int vlan_device_event(struct notifier_block *unused, unsigned long event,
|
|
|
|
void *ptr)
|
2005-04-16 18:20:36 -04:00
|
|
|
{
|
|
|
|
struct net_device *dev = ptr;
|
2008-04-02 03:08:01 -04:00
|
|
|
struct vlan_group *grp;
|
2011-12-07 23:11:18 -05:00
|
|
|
struct vlan_info *vlan_info;
|
2005-04-16 18:20:36 -04:00
|
|
|
int i, flgs;
|
|
|
|
struct net_device *vlandev;
|
2011-12-07 23:11:15 -05:00
|
|
|
struct vlan_dev_priv *vlan;
|
2009-10-30 02:43:00 -04:00
|
|
|
LIST_HEAD(list);
|
2005-04-16 18:20:36 -04:00
|
|
|
|
2008-05-20 17:37:36 -04:00
|
|
|
if (is_vlan_dev(dev))
|
2008-04-02 03:08:01 -04:00
|
|
|
__vlan_device_event(dev, event);
|
|
|
|
|
vlan_dev: VLAN 0 should be treated as "no vlan tag" (802.1p packet)
- Without the 8021q module loaded in the kernel, all 802.1p packets
(VLAN 0 but QoS tagging) are silently discarded (as expected, as
the protocol is not loaded).
- Without this patch in 8021q module, these packets are forwarded to
the module, but they are discarded also if VLAN 0 is not configured,
which should not be the default behaviour, as VLAN 0 is not really
a VLANed packet but a 802.1p packet. Defining VLAN 0 makes it almost
impossible to communicate with mixed 802.1p and non 802.1p devices on
the same network due to arp table issues.
- Changed logic to skip vlan specific code in vlan_skb_recv if VLAN
is 0 and we have not defined a VLAN with ID 0, but we accept the
packet with the encapsulated proto and pass it later to netif_rx.
- In the vlan device event handler, added some logic to add VLAN 0
to HW filter in devices that support it (this prevented any traffic
in VLAN 0 to reach the stack in e1000e with HW filter under 2.6.35,
and probably also with other HW filtered cards, so we fix it here).
- In the vlan unregister logic, prevent the elimination of VLAN 0
in devices with HW filter.
- The default behaviour is to ignore the VLAN 0 tagging and accept
the packet as if it was not tagged, but we can still define a
VLAN 0 if desired (so it is backwards compatible).
Signed-off-by: Pedro Garcia <pedro.netdev@dondevamos.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-07-18 18:38:44 -04:00
|
|
|
if ((event == NETDEV_UP) &&
|
2011-12-07 23:11:17 -05:00
|
|
|
(dev->features & NETIF_F_HW_VLAN_FILTER)) {
|
2011-05-26 06:58:31 -04:00
|
|
|
pr_info("adding VLAN 0 to HW filter on device %s\n",
|
vlan_dev: VLAN 0 should be treated as "no vlan tag" (802.1p packet)
- Without the 8021q module loaded in the kernel, all 802.1p packets
(VLAN 0 but QoS tagging) are silently discarded (as expected, as
the protocol is not loaded).
- Without this patch in 8021q module, these packets are forwarded to
the module, but they are discarded also if VLAN 0 is not configured,
which should not be the default behaviour, as VLAN 0 is not really
a VLANed packet but a 802.1p packet. Defining VLAN 0 makes it almost
impossible to communicate with mixed 802.1p and non 802.1p devices on
the same network due to arp table issues.
- Changed logic to skip vlan specific code in vlan_skb_recv if VLAN
is 0 and we have not defined a VLAN with ID 0, but we accept the
packet with the encapsulated proto and pass it later to netif_rx.
- In the vlan device event handler, added some logic to add VLAN 0
to HW filter in devices that support it (this prevented any traffic
in VLAN 0 to reach the stack in e1000e with HW filter under 2.6.35,
and probably also with other HW filtered cards, so we fix it here).
- In the vlan unregister logic, prevent the elimination of VLAN 0
in devices with HW filter.
- The default behaviour is to ignore the VLAN 0 tagging and accept
the packet as if it was not tagged, but we can still define a
VLAN 0 if desired (so it is backwards compatible).
Signed-off-by: Pedro Garcia <pedro.netdev@dondevamos.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-07-18 18:38:44 -04:00
|
|
|
dev->name);
|
2011-12-07 23:11:17 -05:00
|
|
|
vlan_vid_add(dev, 0);
|
vlan_dev: VLAN 0 should be treated as "no vlan tag" (802.1p packet)
- Without the 8021q module loaded in the kernel, all 802.1p packets
(VLAN 0 but QoS tagging) are silently discarded (as expected, as
the protocol is not loaded).
- Without this patch in 8021q module, these packets are forwarded to
the module, but they are discarded also if VLAN 0 is not configured,
which should not be the default behaviour, as VLAN 0 is not really
a VLANed packet but a 802.1p packet. Defining VLAN 0 makes it almost
impossible to communicate with mixed 802.1p and non 802.1p devices on
the same network due to arp table issues.
- Changed logic to skip vlan specific code in vlan_skb_recv if VLAN
is 0 and we have not defined a VLAN with ID 0, but we accept the
packet with the encapsulated proto and pass it later to netif_rx.
- In the vlan device event handler, added some logic to add VLAN 0
to HW filter in devices that support it (this prevented any traffic
in VLAN 0 to reach the stack in e1000e with HW filter under 2.6.35,
and probably also with other HW filtered cards, so we fix it here).
- In the vlan unregister logic, prevent the elimination of VLAN 0
in devices with HW filter.
- The default behaviour is to ignore the VLAN 0 tagging and accept
the packet as if it was not tagged, but we can still define a
VLAN 0 if desired (so it is backwards compatible).
Signed-off-by: Pedro Garcia <pedro.netdev@dondevamos.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2010-07-18 18:38:44 -04:00
|
|
|
}
|
|
|
|
|
2011-12-07 23:11:18 -05:00
|
|
|
vlan_info = rtnl_dereference(dev->vlan_info);
|
|
|
|
if (!vlan_info)
|
2005-04-16 18:20:36 -04:00
|
|
|
goto out;
|
2011-12-07 23:11:18 -05:00
|
|
|
grp = &vlan_info->grp;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
/* It is OK that we do not hold the group lock right now,
|
|
|
|
* as we run under the RTNL lock.
|
|
|
|
*/
|
|
|
|
|
|
|
|
switch (event) {
|
|
|
|
case NETDEV_CHANGE:
|
|
|
|
/* Propagate real device state to vlan devices */
|
2010-10-20 09:56:02 -04:00
|
|
|
for (i = 0; i < VLAN_N_VID; i++) {
|
2007-03-02 23:44:51 -05:00
|
|
|
vlandev = vlan_group_get_device(grp, i);
|
2005-04-16 18:20:36 -04:00
|
|
|
if (!vlandev)
|
|
|
|
continue;
|
|
|
|
|
2009-12-03 18:59:22 -05:00
|
|
|
netif_stacked_transfer_operstate(dev, vlandev);
|
2005-04-16 18:20:36 -04:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
2007-07-11 22:45:24 -04:00
|
|
|
case NETDEV_CHANGEADDR:
|
|
|
|
/* Adjust unicast filters on underlying device */
|
2010-10-20 09:56:02 -04:00
|
|
|
for (i = 0; i < VLAN_N_VID; i++) {
|
2007-07-11 22:45:24 -04:00
|
|
|
vlandev = vlan_group_get_device(grp, i);
|
|
|
|
if (!vlandev)
|
|
|
|
continue;
|
|
|
|
|
2007-11-11 00:51:40 -05:00
|
|
|
flgs = vlandev->flags;
|
|
|
|
if (!(flgs & IFF_UP))
|
|
|
|
continue;
|
|
|
|
|
2007-07-11 22:45:24 -04:00
|
|
|
vlan_sync_address(dev, vlandev);
|
|
|
|
}
|
2009-07-20 10:35:37 -04:00
|
|
|
break;
|
|
|
|
|
|
|
|
case NETDEV_CHANGEMTU:
|
2010-10-20 09:56:02 -04:00
|
|
|
for (i = 0; i < VLAN_N_VID; i++) {
|
2009-07-20 10:35:37 -04:00
|
|
|
vlandev = vlan_group_get_device(grp, i);
|
|
|
|
if (!vlandev)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (vlandev->mtu <= dev->mtu)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
dev_set_mtu(vlandev, dev->mtu);
|
|
|
|
}
|
2007-07-11 22:45:24 -04:00
|
|
|
break;
|
|
|
|
|
2008-05-20 17:54:50 -04:00
|
|
|
case NETDEV_FEAT_CHANGE:
|
|
|
|
/* Propagate device features to underlying device */
|
2010-10-20 09:56:02 -04:00
|
|
|
for (i = 0; i < VLAN_N_VID; i++) {
|
2008-05-20 17:54:50 -04:00
|
|
|
vlandev = vlan_group_get_device(grp, i);
|
|
|
|
if (!vlandev)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
vlan_transfer_features(dev, vlandev);
|
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
case NETDEV_DOWN:
|
2012-07-09 16:47:19 -04:00
|
|
|
if (dev->features & NETIF_F_HW_VLAN_FILTER)
|
|
|
|
vlan_vid_del(dev, 0);
|
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
/* Put all VLANs for this dev in the down state too. */
|
2010-10-20 09:56:02 -04:00
|
|
|
for (i = 0; i < VLAN_N_VID; i++) {
|
2007-03-02 23:44:51 -05:00
|
|
|
vlandev = vlan_group_get_device(grp, i);
|
2005-04-16 18:20:36 -04:00
|
|
|
if (!vlandev)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
flgs = vlandev->flags;
|
|
|
|
if (!(flgs & IFF_UP))
|
|
|
|
continue;
|
|
|
|
|
2011-12-07 23:11:15 -05:00
|
|
|
vlan = vlan_dev_priv(vlandev);
|
2009-11-25 02:54:54 -05:00
|
|
|
if (!(vlan->flags & VLAN_FLAG_LOOSE_BINDING))
|
|
|
|
dev_change_flags(vlandev, flgs & ~IFF_UP);
|
2009-12-03 18:59:22 -05:00
|
|
|
netif_stacked_transfer_operstate(dev, vlandev);
|
2005-04-16 18:20:36 -04:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case NETDEV_UP:
|
|
|
|
/* Put all VLANs for this dev in the up state too. */
|
2010-10-20 09:56:02 -04:00
|
|
|
for (i = 0; i < VLAN_N_VID; i++) {
|
2007-03-02 23:44:51 -05:00
|
|
|
vlandev = vlan_group_get_device(grp, i);
|
2005-04-16 18:20:36 -04:00
|
|
|
if (!vlandev)
|
|
|
|
continue;
|
2007-02-09 09:24:25 -05:00
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
flgs = vlandev->flags;
|
|
|
|
if (flgs & IFF_UP)
|
|
|
|
continue;
|
|
|
|
|
2011-12-07 23:11:15 -05:00
|
|
|
vlan = vlan_dev_priv(vlandev);
|
2009-11-25 02:54:54 -05:00
|
|
|
if (!(vlan->flags & VLAN_FLAG_LOOSE_BINDING))
|
|
|
|
dev_change_flags(vlandev, flgs | IFF_UP);
|
2009-12-03 18:59:22 -05:00
|
|
|
netif_stacked_transfer_operstate(dev, vlandev);
|
2005-04-16 18:20:36 -04:00
|
|
|
}
|
|
|
|
break;
|
2007-02-09 09:24:25 -05:00
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
case NETDEV_UNREGISTER:
|
2010-09-16 23:22:19 -04:00
|
|
|
/* twiddle thumbs on netns device moves */
|
|
|
|
if (dev->reg_state != NETREG_UNREGISTERING)
|
|
|
|
break;
|
|
|
|
|
2010-10-20 09:56:02 -04:00
|
|
|
for (i = 0; i < VLAN_N_VID; i++) {
|
2009-10-30 02:43:00 -04:00
|
|
|
vlandev = vlan_group_get_device(grp, i);
|
|
|
|
if (!vlandev)
|
|
|
|
continue;
|
|
|
|
|
2011-12-07 23:11:18 -05:00
|
|
|
/* removal of last vid destroys vlan_info, abort
|
2009-10-30 02:43:00 -04:00
|
|
|
* afterwards */
|
2011-12-07 23:11:18 -05:00
|
|
|
if (vlan_info->nr_vids == 1)
|
2010-10-20 09:56:02 -04:00
|
|
|
i = VLAN_N_VID;
|
2009-10-30 02:43:00 -04:00
|
|
|
|
|
|
|
unregister_vlan_dev(vlandev, &list);
|
|
|
|
}
|
|
|
|
unregister_netdevice_many(&list);
|
2005-04-16 18:20:36 -04:00
|
|
|
break;
|
2010-03-10 05:30:19 -05:00
|
|
|
|
|
|
|
case NETDEV_PRE_TYPE_CHANGE:
|
|
|
|
/* Forbid underlaying device to change its type. */
|
|
|
|
return NOTIFY_BAD;
|
2011-04-15 09:46:49 -04:00
|
|
|
|
|
|
|
case NETDEV_NOTIFY_PEERS:
|
2011-04-15 09:47:51 -04:00
|
|
|
case NETDEV_BONDING_FAILOVER:
|
2011-04-15 09:46:49 -04:00
|
|
|
/* Propagate to vlan devices */
|
|
|
|
for (i = 0; i < VLAN_N_VID; i++) {
|
|
|
|
vlandev = vlan_group_get_device(grp, i);
|
|
|
|
if (!vlandev)
|
|
|
|
continue;
|
|
|
|
|
2011-04-15 09:47:51 -04:00
|
|
|
call_netdevice_notifiers(event, vlandev);
|
2011-04-15 09:46:49 -04:00
|
|
|
}
|
|
|
|
break;
|
2007-04-20 20:09:22 -04:00
|
|
|
}
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
out:
|
|
|
|
return NOTIFY_DONE;
|
|
|
|
}
|
|
|
|
|
2008-01-21 03:25:15 -05:00
|
|
|
static struct notifier_block vlan_notifier_block __read_mostly = {
|
|
|
|
.notifier_call = vlan_device_event,
|
|
|
|
};
|
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
/*
|
|
|
|
* VLAN IOCTL handler.
|
|
|
|
* o execute requested action or pass command to the device driver
|
|
|
|
* arg is really a struct vlan_ioctl_args __user *.
|
|
|
|
*/
|
2007-09-17 14:56:21 -04:00
|
|
|
static int vlan_ioctl_handler(struct net *net, void __user *arg)
|
2005-04-16 18:20:36 -04:00
|
|
|
{
|
2007-06-13 15:05:22 -04:00
|
|
|
int err;
|
2005-04-16 18:20:36 -04:00
|
|
|
struct vlan_ioctl_args args;
|
2007-06-13 15:05:22 -04:00
|
|
|
struct net_device *dev = NULL;
|
2005-04-16 18:20:36 -04:00
|
|
|
|
|
|
|
if (copy_from_user(&args, arg, sizeof(struct vlan_ioctl_args)))
|
|
|
|
return -EFAULT;
|
|
|
|
|
|
|
|
/* Null terminate this sucker, just in case. */
|
|
|
|
args.device1[23] = 0;
|
|
|
|
args.u.device2[23] = 0;
|
|
|
|
|
2007-06-13 15:05:22 -04:00
|
|
|
rtnl_lock();
|
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
switch (args.cmd) {
|
|
|
|
case SET_VLAN_INGRESS_PRIORITY_CMD:
|
2007-06-13 15:05:22 -04:00
|
|
|
case SET_VLAN_EGRESS_PRIORITY_CMD:
|
|
|
|
case SET_VLAN_FLAG_CMD:
|
|
|
|
case ADD_VLAN_CMD:
|
|
|
|
case DEL_VLAN_CMD:
|
|
|
|
case GET_VLAN_REALDEV_NAME_CMD:
|
|
|
|
case GET_VLAN_VID_CMD:
|
|
|
|
err = -ENODEV;
|
2008-04-16 03:55:06 -04:00
|
|
|
dev = __dev_get_by_name(net, args.device1);
|
2007-06-13 15:05:22 -04:00
|
|
|
if (!dev)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
err = -EINVAL;
|
2008-07-08 06:22:16 -04:00
|
|
|
if (args.cmd != ADD_VLAN_CMD && !is_vlan_dev(dev))
|
2007-06-13 15:05:22 -04:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (args.cmd) {
|
|
|
|
case SET_VLAN_INGRESS_PRIORITY_CMD:
|
|
|
|
err = -EPERM;
|
2005-04-16 18:20:36 -04:00
|
|
|
if (!capable(CAP_NET_ADMIN))
|
2007-06-13 15:05:22 -04:00
|
|
|
break;
|
|
|
|
vlan_dev_set_ingress_priority(dev,
|
|
|
|
args.u.skb_priority,
|
|
|
|
args.vlan_qos);
|
2007-11-07 04:31:32 -05:00
|
|
|
err = 0;
|
2005-04-16 18:20:36 -04:00
|
|
|
break;
|
|
|
|
|
|
|
|
case SET_VLAN_EGRESS_PRIORITY_CMD:
|
2007-06-13 15:05:22 -04:00
|
|
|
err = -EPERM;
|
2005-04-16 18:20:36 -04:00
|
|
|
if (!capable(CAP_NET_ADMIN))
|
2007-06-13 15:05:22 -04:00
|
|
|
break;
|
|
|
|
err = vlan_dev_set_egress_priority(dev,
|
2005-04-16 18:20:36 -04:00
|
|
|
args.u.skb_priority,
|
|
|
|
args.vlan_qos);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case SET_VLAN_FLAG_CMD:
|
2007-06-13 15:05:22 -04:00
|
|
|
err = -EPERM;
|
2005-04-16 18:20:36 -04:00
|
|
|
if (!capable(CAP_NET_ADMIN))
|
2007-06-13 15:05:22 -04:00
|
|
|
break;
|
2008-07-06 00:26:27 -04:00
|
|
|
err = vlan_dev_change_flags(dev,
|
|
|
|
args.vlan_qos ? args.u.flag : 0,
|
|
|
|
args.u.flag);
|
2005-04-16 18:20:36 -04:00
|
|
|
break;
|
|
|
|
|
|
|
|
case SET_VLAN_NAME_TYPE_CMD:
|
2007-06-13 15:05:22 -04:00
|
|
|
err = -EPERM;
|
2005-04-16 18:20:36 -04:00
|
|
|
if (!capable(CAP_NET_ADMIN))
|
2007-12-07 01:52:16 -05:00
|
|
|
break;
|
2007-06-13 15:05:22 -04:00
|
|
|
if ((args.u.name_type >= 0) &&
|
|
|
|
(args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
|
2008-04-16 03:54:39 -04:00
|
|
|
struct vlan_net *vn;
|
|
|
|
|
|
|
|
vn = net_generic(net, vlan_net_id);
|
|
|
|
vn->name_type = args.u.name_type;
|
2005-04-16 18:20:36 -04:00
|
|
|
err = 0;
|
|
|
|
} else {
|
|
|
|
err = -EINVAL;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case ADD_VLAN_CMD:
|
2007-06-13 15:05:22 -04:00
|
|
|
err = -EPERM;
|
2005-04-16 18:20:36 -04:00
|
|
|
if (!capable(CAP_NET_ADMIN))
|
2007-06-13 15:05:22 -04:00
|
|
|
break;
|
2007-06-13 15:06:43 -04:00
|
|
|
err = register_vlan_device(dev, args.u.VID);
|
2005-04-16 18:20:36 -04:00
|
|
|
break;
|
|
|
|
|
|
|
|
case DEL_VLAN_CMD:
|
2007-06-13 15:05:22 -04:00
|
|
|
err = -EPERM;
|
2005-04-16 18:20:36 -04:00
|
|
|
if (!capable(CAP_NET_ADMIN))
|
2007-06-13 15:05:22 -04:00
|
|
|
break;
|
2009-10-27 03:06:36 -04:00
|
|
|
unregister_vlan_dev(dev, NULL);
|
2008-01-21 03:25:50 -05:00
|
|
|
err = 0;
|
2005-04-16 18:20:36 -04:00
|
|
|
break;
|
|
|
|
|
|
|
|
case GET_VLAN_REALDEV_NAME_CMD:
|
2007-07-24 18:37:11 -04:00
|
|
|
err = 0;
|
2007-06-13 15:05:22 -04:00
|
|
|
vlan_dev_get_realdev_name(dev, args.u.device2);
|
2005-04-16 18:20:36 -04:00
|
|
|
if (copy_to_user(arg, &args,
|
2008-01-21 03:26:41 -05:00
|
|
|
sizeof(struct vlan_ioctl_args)))
|
2005-04-16 18:20:36 -04:00
|
|
|
err = -EFAULT;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case GET_VLAN_VID_CMD:
|
2007-07-24 18:37:11 -04:00
|
|
|
err = 0;
|
2008-07-08 06:23:57 -04:00
|
|
|
args.u.VID = vlan_dev_vlan_id(dev);
|
2005-04-16 18:20:36 -04:00
|
|
|
if (copy_to_user(arg, &args,
|
2008-01-21 03:26:41 -05:00
|
|
|
sizeof(struct vlan_ioctl_args)))
|
2007-02-09 09:24:25 -05:00
|
|
|
err = -EFAULT;
|
2005-04-16 18:20:36 -04:00
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
2008-01-21 03:24:59 -05:00
|
|
|
err = -EOPNOTSUPP;
|
2007-06-13 15:05:22 -04:00
|
|
|
break;
|
2007-04-20 20:09:22 -04:00
|
|
|
}
|
2005-12-21 21:39:49 -05:00
|
|
|
out:
|
2007-06-13 15:05:22 -04:00
|
|
|
rtnl_unlock();
|
2005-04-16 18:20:36 -04:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2010-01-16 22:35:32 -05:00
|
|
|
static int __net_init vlan_init_net(struct net *net)
|
2008-04-16 03:49:09 -04:00
|
|
|
{
|
2009-11-29 10:46:05 -05:00
|
|
|
struct vlan_net *vn = net_generic(net, vlan_net_id);
|
2008-04-16 03:49:09 -04:00
|
|
|
int err;
|
|
|
|
|
2008-04-16 03:54:39 -04:00
|
|
|
vn->name_type = VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD;
|
|
|
|
|
2008-04-16 03:51:12 -04:00
|
|
|
err = vlan_proc_init(net);
|
|
|
|
|
2008-04-16 03:49:09 -04:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2010-01-16 22:35:32 -05:00
|
|
|
static void __net_exit vlan_exit_net(struct net *net)
|
2008-04-16 03:49:09 -04:00
|
|
|
{
|
2008-04-16 03:51:12 -04:00
|
|
|
vlan_proc_cleanup(net);
|
2008-04-16 03:49:09 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static struct pernet_operations vlan_net_ops = {
|
|
|
|
.init = vlan_init_net,
|
|
|
|
.exit = vlan_exit_net,
|
2009-11-29 10:46:05 -05:00
|
|
|
.id = &vlan_net_id,
|
|
|
|
.size = sizeof(struct vlan_net),
|
2008-04-16 03:49:09 -04:00
|
|
|
};
|
|
|
|
|
2008-01-21 03:25:15 -05:00
|
|
|
static int __init vlan_proto_init(void)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
2011-05-23 16:43:48 -04:00
|
|
|
pr_info("%s v%s\n", vlan_fullname, vlan_version);
|
2008-01-21 03:25:15 -05:00
|
|
|
|
2009-12-02 08:19:08 -05:00
|
|
|
err = register_pernet_subsys(&vlan_net_ops);
|
2008-04-16 03:49:09 -04:00
|
|
|
if (err < 0)
|
|
|
|
goto err0;
|
|
|
|
|
2008-01-21 03:25:15 -05:00
|
|
|
err = register_netdevice_notifier(&vlan_notifier_block);
|
|
|
|
if (err < 0)
|
|
|
|
goto err2;
|
|
|
|
|
2008-07-06 00:26:57 -04:00
|
|
|
err = vlan_gvrp_init();
|
2008-01-21 03:25:15 -05:00
|
|
|
if (err < 0)
|
|
|
|
goto err3;
|
|
|
|
|
2008-07-06 00:26:57 -04:00
|
|
|
err = vlan_netlink_init();
|
|
|
|
if (err < 0)
|
|
|
|
goto err4;
|
|
|
|
|
2008-01-21 03:25:15 -05:00
|
|
|
vlan_ioctl_set(vlan_ioctl_handler);
|
|
|
|
return 0;
|
|
|
|
|
2008-07-06 00:26:57 -04:00
|
|
|
err4:
|
|
|
|
vlan_gvrp_uninit();
|
2008-01-21 03:25:15 -05:00
|
|
|
err3:
|
|
|
|
unregister_netdevice_notifier(&vlan_notifier_block);
|
|
|
|
err2:
|
2009-12-02 08:19:08 -05:00
|
|
|
unregister_pernet_subsys(&vlan_net_ops);
|
2008-04-16 03:49:09 -04:00
|
|
|
err0:
|
2008-01-21 03:25:15 -05:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void __exit vlan_cleanup_module(void)
|
|
|
|
{
|
|
|
|
vlan_ioctl_set(NULL);
|
|
|
|
vlan_netlink_fini();
|
|
|
|
|
|
|
|
unregister_netdevice_notifier(&vlan_notifier_block);
|
|
|
|
|
2009-12-02 08:19:08 -05:00
|
|
|
unregister_pernet_subsys(&vlan_net_ops);
|
2009-06-07 23:11:28 -04:00
|
|
|
rcu_barrier(); /* Wait for completion of call_rcu()'s */
|
2008-07-06 00:26:57 -04:00
|
|
|
|
|
|
|
vlan_gvrp_uninit();
|
2008-01-21 03:25:15 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
module_init(vlan_proto_init);
|
|
|
|
module_exit(vlan_cleanup_module);
|
|
|
|
|
2005-04-16 18:20:36 -04:00
|
|
|
MODULE_LICENSE("GPL");
|
|
|
|
MODULE_VERSION(DRV_VERSION);
|