9 files changed, 161 insertions, 30 deletions

diff --git a/net/8021q/Kconfig b/net/8021q/Kconfig
index fa073a54963e..8f7517df41a5 100644
--- a/net/8021q/Kconfig
+++ b/net/8021q/Kconfig
@@ -27,3 +27,14 @@ config VLAN_8021Q_GVRP
           automatic propagation of registered VLANs to switches.
 
           If unsure, say N.
+
+config VLAN_8021Q_MVRP
+        bool "MVRP (Multiple VLAN Registration Protocol) support"
+        depends on VLAN_8021Q
+        select MRP
+        help
+          Select this to enable MVRP end-system support. MVRP is used for
+          automatic propagation of registered VLANs to switches; it
+          supersedes GVRP and is not backwards-compatible.
+
+          If unsure, say N.
diff --git a/net/8021q/Makefile b/net/8021q/Makefile
index 9f4f174ead1c..7bc8db08d7ef 100644
--- a/net/8021q/Makefile
+++ b/net/8021q/Makefile
@@ -6,5 +6,6 @@ obj-$(CONFIG_VLAN_8021Q)		+= 8021q.o
 
 8021q-y                                 := vlan.o vlan_dev.o vlan_netlink.o
 8021q-$(CONFIG_VLAN_8021Q_GVRP)         += vlan_gvrp.o
+8021q-$(CONFIG_VLAN_8021Q_MVRP)         += vlan_mvrp.o
 8021q-$(CONFIG_PROC_FS)                 += vlanproc.o
 
diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index a292e8050ef2..a18714469bf7 100644
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -95,6 +95,8 @@ void unregister_vlan_dev(struct net_device *dev, struct list_head *head)
 
         grp->nr_vlan_devs--;
 
+        if (vlan->flags & VLAN_FLAG_MVRP)
+                vlan_mvrp_request_leave(dev);
         if (vlan->flags & VLAN_FLAG_GVRP)
                 vlan_gvrp_request_leave(dev);
 
@@ -105,8 +107,12 @@ void unregister_vlan_dev(struct net_device *dev, struct list_head *head)
          */
         unregister_netdevice_queue(dev, head);
 
-        if (grp->nr_vlan_devs == 0)
+        netdev_upper_dev_unlink(real_dev, dev);
+
+        if (grp->nr_vlan_devs == 0) {
+                vlan_mvrp_uninit_applicant(real_dev);
                 vlan_gvrp_uninit_applicant(real_dev);
+        }
 
         /* Get rid of the vlan's reference to real_dev */
         dev_put(real_dev);
@@ -115,19 +121,12 @@ void unregister_vlan_dev(struct net_device *dev, struct list_head *head)
 int vlan_check_real_dev(struct net_device *real_dev, u16 vlan_id)
 {
         const char *name = real_dev->name;
-        const struct net_device_ops *ops = real_dev->netdev_ops;
 
         if (real_dev->features & NETIF_F_VLAN_CHALLENGED) {
                 pr_info("VLANs not supported on %s\n", name);
                 return -EOPNOTSUPP;
         }
 
-        if ((real_dev->features & NETIF_F_HW_VLAN_FILTER) &&
-            (!ops->ndo_vlan_rx_add_vid || !ops->ndo_vlan_rx_kill_vid)) {
-                pr_info("Device %s has buggy VLAN hw accel\n", name);
-                return -EOPNOTSUPP;
-        }
-
         if (vlan_find_dev(real_dev, vlan_id) != NULL)
                 return -EEXIST;
 
@@ -156,15 +155,22 @@ int register_vlan_dev(struct net_device *dev)
                 err = vlan_gvrp_init_applicant(real_dev);
                 if (err < 0)
                         goto out_vid_del;
+                err = vlan_mvrp_init_applicant(real_dev);
+                if (err < 0)
+                        goto out_uninit_gvrp;
         }
 
         err = vlan_group_prealloc_vid(grp, vlan_id);
         if (err < 0)
-                goto out_uninit_applicant;
+                goto out_uninit_mvrp;
+
+        err = netdev_upper_dev_link(real_dev, dev);
+        if (err)
+                goto out_uninit_mvrp;
 
         err = register_netdevice(dev);
         if (err < 0)
-                goto out_uninit_applicant;
+                goto out_upper_dev_unlink;
 
         /* Account for reference in struct vlan_dev_priv */
         dev_hold(real_dev);
@@ -180,7 +186,12 @@ int register_vlan_dev(struct net_device *dev)
 
         return 0;
 
-out_uninit_applicant:
+out_upper_dev_unlink:
+        netdev_upper_dev_unlink(real_dev, dev);
+out_uninit_mvrp:
+        if (grp->nr_vlan_devs == 0)
+                vlan_mvrp_uninit_applicant(real_dev);
+out_uninit_gvrp:
         if (grp->nr_vlan_devs == 0)
                 vlan_gvrp_uninit_applicant(real_dev);
 out_vid_del:
@@ -654,13 +665,19 @@ static int __init vlan_proto_init(void)
         if (err < 0)
                 goto err3;
 
-        err = vlan_netlink_init();
+        err = vlan_mvrp_init();
         if (err < 0)
                 goto err4;
 
+        err = vlan_netlink_init();
+        if (err < 0)
+                goto err5;
+
         vlan_ioctl_set(vlan_ioctl_handler);
         return 0;
 
+err5:
+        vlan_mvrp_uninit();
 err4:
         vlan_gvrp_uninit();
 err3:
@@ -681,6 +698,7 @@ static void __exit vlan_cleanup_module(void)
         unregister_pernet_subsys(&vlan_net_ops);
         rcu_barrier(); /* Wait for completion of call_rcu()'s */
 
+        vlan_mvrp_uninit();
         vlan_gvrp_uninit();
 }
 
diff --git a/net/8021q/vlan.h b/net/8021q/vlan.h
index a4886d94c40c..670f1e8cfc0f 100644
--- a/net/8021q/vlan.h
+++ b/net/8021q/vlan.h
@@ -171,6 +171,22 @@ static inline int vlan_gvrp_init(void) { return 0; }
 static inline void vlan_gvrp_uninit(void) {}
 #endif
 
+#ifdef CONFIG_VLAN_8021Q_MVRP
+extern int vlan_mvrp_request_join(const struct net_device *dev);
+extern void vlan_mvrp_request_leave(const struct net_device *dev);
+extern int vlan_mvrp_init_applicant(struct net_device *dev);
+extern void vlan_mvrp_uninit_applicant(struct net_device *dev);
+extern int vlan_mvrp_init(void);
+extern void vlan_mvrp_uninit(void);
+#else
+static inline int vlan_mvrp_request_join(const struct net_device *dev) { return 0; }
+static inline void vlan_mvrp_request_leave(const struct net_device *dev) {}
+static inline int vlan_mvrp_init_applicant(struct net_device *dev) { return 0; }
+static inline void vlan_mvrp_uninit_applicant(struct net_device *dev) {}
+static inline int vlan_mvrp_init(void) { return 0; }
+static inline void vlan_mvrp_uninit(void) {}
+#endif
+
 extern const char vlan_fullname[];
 extern const char vlan_version[];
 extern int vlan_netlink_init(void);
diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c
index 65e06abe023f..f3b6f515eba6 100644
--- a/net/8021q/vlan_core.c
+++ b/net/8021q/vlan_core.c
@@ -60,21 +60,25 @@ bool vlan_do_receive(struct sk_buff **skbp)
         return true;
 }
 
-/* Must be invoked with rcu_read_lock or with RTNL. */
-struct net_device *__vlan_find_dev_deep(struct net_device *real_dev,
+/* Must be invoked with rcu_read_lock. */
+struct net_device *__vlan_find_dev_deep(struct net_device *dev,
                                         u16 vlan_id)
 {
-        struct vlan_info *vlan_info = rcu_dereference_rtnl(real_dev->vlan_info);
+        struct vlan_info *vlan_info = rcu_dereference(dev->vlan_info);
 
         if (vlan_info) {
                 return vlan_group_get_device(&vlan_info->grp, vlan_id);
         } else {
                 /*
-                 * Bonding slaves do not have grp assigned to themselves.
-                 * Grp is assigned to bonding master instead.
+                 * Lower devices of master uppers (bonding, team) do not have
+                 * grp assigned to themselves. Grp is assigned to upper device
+                 * instead.
                  */
-                if (netif_is_bond_slave(real_dev))
-                        return __vlan_find_dev_deep(real_dev->master, vlan_id);
+                struct net_device *upper_dev;
+
+                upper_dev = netdev_master_upper_dev_get_rcu(dev);
+                if (upper_dev)
+                        return __vlan_find_dev_deep(upper_dev, vlan_id);
         }
 
         return NULL;
@@ -140,6 +144,7 @@ err_free:
         kfree_skb(skb);
         return NULL;
 }
+EXPORT_SYMBOL(vlan_untag);
 
 
 /*
@@ -220,8 +225,7 @@ static int __vlan_vid_add(struct vlan_info *vlan_info, unsigned short vid,
         if (!vid_info)
                 return -ENOMEM;
 
-        if ((dev->features & NETIF_F_HW_VLAN_FILTER) &&
-            ops->ndo_vlan_rx_add_vid) {
+        if (dev->features & NETIF_F_HW_VLAN_FILTER) {
                 err =  ops->ndo_vlan_rx_add_vid(dev, vid);
                 if (err) {
                         kfree(vid_info);
@@ -278,8 +282,7 @@ static void __vlan_vid_del(struct vlan_info *vlan_info,
         unsigned short vid = vid_info->vid;
         int err;
 
-        if ((dev->features & NETIF_F_HW_VLAN_FILTER) &&
-             ops->ndo_vlan_rx_kill_vid) {
+        if (dev->features & NETIF_F_HW_VLAN_FILTER) {
                 err = ops->ndo_vlan_rx_kill_vid(dev, vid);
                 if (err) {
                         pr_warn("failed to kill vid %d for device %s\n",
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index 4a6d31a082b9..19cf81bf9f69 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -261,7 +261,7 @@ int vlan_dev_change_flags(const struct net_device *dev, u32 flags, u32 mask)
         u32 old_flags = vlan->flags;
 
         if (mask & ~(VLAN_FLAG_REORDER_HDR | VLAN_FLAG_GVRP |
-                     VLAN_FLAG_LOOSE_BINDING))
+                     VLAN_FLAG_LOOSE_BINDING | VLAN_FLAG_MVRP))
                 return -EINVAL;
 
         vlan->flags = (old_flags & ~mask) | (flags & mask);
@@ -272,6 +272,13 @@ int vlan_dev_change_flags(const struct net_device *dev, u32 flags, u32 mask)
                 else
                         vlan_gvrp_request_leave(dev);
         }
+
+        if (netif_running(dev) && (vlan->flags ^ old_flags) & VLAN_FLAG_MVRP) {
+                if (vlan->flags & VLAN_FLAG_MVRP)
+                        vlan_mvrp_request_join(dev);
+                else
+                        vlan_mvrp_request_leave(dev);
+        }
         return 0;
 }
 
@@ -312,6 +319,9 @@ static int vlan_dev_open(struct net_device *dev)
         if (vlan->flags & VLAN_FLAG_GVRP)
                 vlan_gvrp_request_join(dev);
 
+        if (vlan->flags & VLAN_FLAG_MVRP)
+                vlan_mvrp_request_join(dev);
+
         if (netif_carrier_ok(real_dev))
                 netif_carrier_on(dev);
         return 0;
@@ -640,9 +650,9 @@ static int vlan_ethtool_get_settings(struct net_device *dev,
 static void vlan_ethtool_get_drvinfo(struct net_device *dev,
                                      struct ethtool_drvinfo *info)
 {
-        strcpy(info->driver, vlan_fullname);
-        strcpy(info->version, vlan_version);
-        strcpy(info->fw_version, "N/A");
+        strlcpy(info->driver, vlan_fullname, sizeof(info->driver));
+        strlcpy(info->version, vlan_version, sizeof(info->version));
+        strlcpy(info->fw_version, "N/A", sizeof(info->fw_version));
 }
 
 static struct rtnl_link_stats64 *vlan_dev_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats)
@@ -723,7 +733,7 @@ static void vlan_dev_netpoll_cleanup(struct net_device *dev)
 
         vlan->netpoll = NULL;
 
-        __netpoll_free_rcu(netpoll);
+        __netpoll_free_async(netpoll);
 }
 #endif /* CONFIG_NET_POLL_CONTROLLER */
 
diff --git a/net/8021q/vlan_mvrp.c b/net/8021q/vlan_mvrp.c
new file mode 100644
index 000000000000..d9ec1d5964aa
--- /dev/null
+++ b/net/8021q/vlan_mvrp.c
@@ -0,0 +1,72 @@
+/*
+ *      IEEE 802.1Q Multiple VLAN Registration Protocol (MVRP)
+ *
+ *      Copyright (c) 2012 Massachusetts Institute of Technology
+ *
+ *      Adapted from code in net/8021q/vlan_gvrp.c
+ *      Copyright (c) 2008 Patrick McHardy <kaber@trash.net>
+ *
+ *      This program is free software; you can redistribute it and/or
+ *      modify it under the terms of the GNU General Public License
+ *      version 2 as published by the Free Software Foundation.
+ */
+#include <linux/types.h>
+#include <linux/if_ether.h>
+#include <linux/if_vlan.h>
+#include <net/mrp.h>
+#include "vlan.h"
+
+#define MRP_MVRP_ADDRESS        { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x21 }
+
+enum mvrp_attributes {
+        MVRP_ATTR_INVALID,
+        MVRP_ATTR_VID,
+        __MVRP_ATTR_MAX
+};
+#define MVRP_ATTR_MAX   (__MVRP_ATTR_MAX - 1)
+
+static struct mrp_application vlan_mrp_app __read_mostly = {
+        .type           = MRP_APPLICATION_MVRP,
+        .maxattr        = MVRP_ATTR_MAX,
+        .pkttype.type   = htons(ETH_P_MVRP),
+        .group_address  = MRP_MVRP_ADDRESS,
+        .version        = 0,
+};
+
+int vlan_mvrp_request_join(const struct net_device *dev)
+{
+        const struct vlan_dev_priv *vlan = vlan_dev_priv(dev);
+        __be16 vlan_id = htons(vlan->vlan_id);
+
+        return mrp_request_join(vlan->real_dev, &vlan_mrp_app,
+                                &vlan_id, sizeof(vlan_id), MVRP_ATTR_VID);
+}
+
+void vlan_mvrp_request_leave(const struct net_device *dev)
+{
+        const struct vlan_dev_priv *vlan = vlan_dev_priv(dev);
+        __be16 vlan_id = htons(vlan->vlan_id);
+
+        mrp_request_leave(vlan->real_dev, &vlan_mrp_app,
+                          &vlan_id, sizeof(vlan_id), MVRP_ATTR_VID);
+}
+
+int vlan_mvrp_init_applicant(struct net_device *dev)
+{
+        return mrp_init_applicant(dev, &vlan_mrp_app);
+}
+
+void vlan_mvrp_uninit_applicant(struct net_device *dev)
+{
+        mrp_uninit_applicant(dev, &vlan_mrp_app);
+}
+
+int __init vlan_mvrp_init(void)
+{
+        return mrp_register_application(&vlan_mrp_app);
+}
+
+void vlan_mvrp_uninit(void)
+{
+        mrp_unregister_application(&vlan_mrp_app);
+}
diff --git a/net/8021q/vlan_netlink.c b/net/8021q/vlan_netlink.c
index 708c80ea1874..1789658b7cd7 100644
--- a/net/8021q/vlan_netlink.c
+++ b/net/8021q/vlan_netlink.c
@@ -62,7 +62,7 @@ static int vlan_validate(struct nlattr *tb[], struct nlattr *data[])
                 flags = nla_data(data[IFLA_VLAN_FLAGS]);
                 if ((flags->flags & flags->mask) &
                     ~(VLAN_FLAG_REORDER_HDR | VLAN_FLAG_GVRP |
-                      VLAN_FLAG_LOOSE_BINDING))
+                      VLAN_FLAG_LOOSE_BINDING | VLAN_FLAG_MVRP))
                         return -EINVAL;
         }
 
diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c
index 4de77ea5fa37..dc526ec965e4 100644
--- a/net/8021q/vlanproc.c
+++ b/net/8021q/vlanproc.c
@@ -131,7 +131,7 @@ void vlan_proc_cleanup(struct net *net)
                 remove_proc_entry(name_conf, vn->proc_vlan_dir);
 
         if (vn->proc_vlan_dir)
-                proc_net_remove(net, name_root);
+                remove_proc_entry(name_root, net->proc_net);
 
         /* Dynamically added entries should be cleaned up as their vlan_device
          * is removed, so we should not have to take care of it here...