6 files changed, 140 insertions, 100 deletions

diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index a29c5ab5815c..33f90e7362cc 100644
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -41,7 +41,7 @@
 
 /* Global VLAN variables */
 
-int vlan_net_id;
+int vlan_net_id __read_mostly;
 
 /* Our listing of VLAN group(s) */
 static struct hlist_head vlan_group_hash[VLAN_GRP_HASH_SIZE];
@@ -140,7 +140,7 @@ static void vlan_rcu_free(struct rcu_head *rcu)
         vlan_group_free(container_of(rcu, struct vlan_group, rcu));
 }
 
-void unregister_vlan_dev(struct net_device *dev)
+void unregister_vlan_dev(struct net_device *dev, struct list_head *head)
 {
         struct vlan_dev_info *vlan = vlan_dev_info(dev);
         struct net_device *real_dev = vlan->real_dev;
@@ -159,12 +159,13 @@ void unregister_vlan_dev(struct net_device *dev)
         if (real_dev->features & NETIF_F_HW_VLAN_FILTER)
                 ops->ndo_vlan_rx_kill_vid(real_dev, vlan_id);
 
-        vlan_group_set_device(grp, vlan_id, NULL);
         grp->nr_vlans--;
 
-        synchronize_net();
+        vlan_group_set_device(grp, vlan_id, NULL);
+        if (!grp->killall)
+                synchronize_net();
 
-        unregister_netdevice(dev);
+        unregister_netdevice_queue(dev, head);
 
         /* If the group is now empty, kill off the group. */
         if (grp->nr_vlans == 0) {
@@ -183,27 +184,6 @@ void unregister_vlan_dev(struct net_device *dev)
         dev_put(real_dev);
 }
 
-static void vlan_transfer_operstate(const struct net_device *dev,
-                                    struct net_device *vlandev)
-{
-        /* Have to respect userspace enforced dormant state
-         * of real device, also must allow supplicant running
-         * on VLAN device
-         */
-        if (dev->operstate == IF_OPER_DORMANT)
-                netif_dormant_on(vlandev);
-        else
-                netif_dormant_off(vlandev);
-
-        if (netif_carrier_ok(dev)) {
-                if (!netif_carrier_ok(vlandev))
-                        netif_carrier_on(vlandev);
-        } else {
-                if (netif_carrier_ok(vlandev))
-                        netif_carrier_off(vlandev);
-        }
-}
-
 int vlan_check_real_dev(struct net_device *real_dev, u16 vlan_id)
 {
         const char *name = real_dev->name;
@@ -261,7 +241,7 @@ int register_vlan_dev(struct net_device *dev)
         /* Account for reference in struct vlan_dev_info */
         dev_hold(real_dev);
 
-        vlan_transfer_operstate(real_dev, dev);
+        netif_stacked_transfer_operstate(real_dev, dev);
         linkwatch_fire_event(dev); /* _MUST_ call rfc2863_policy() */
 
         /* So, got the sucker initialized, now lets place
@@ -430,6 +410,8 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event,
         struct vlan_group *grp;
         int i, flgs;
         struct net_device *vlandev;
+        struct vlan_dev_info *vlan;
+        LIST_HEAD(list);
 
         if (is_vlan_dev(dev))
                 __vlan_device_event(dev, event);
@@ -450,7 +432,7 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event,
                         if (!vlandev)
                                 continue;
 
-                        vlan_transfer_operstate(dev, vlandev);
+                        netif_stacked_transfer_operstate(dev, vlandev);
                 }
                 break;
 
@@ -505,8 +487,10 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event,
                         if (!(flgs & IFF_UP))
                                 continue;
 
-                        dev_change_flags(vlandev, flgs & ~IFF_UP);
-                        vlan_transfer_operstate(dev, vlandev);
+                        vlan = vlan_dev_info(vlandev);
+                        if (!(vlan->flags & VLAN_FLAG_LOOSE_BINDING))
+                                dev_change_flags(vlandev, flgs & ~IFF_UP);
+                        netif_stacked_transfer_operstate(dev, vlandev);
                 }
                 break;
 
@@ -521,13 +505,17 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event,
                         if (flgs & IFF_UP)
                                 continue;
 
-                        dev_change_flags(vlandev, flgs | IFF_UP);
-                        vlan_transfer_operstate(dev, vlandev);
+                        vlan = vlan_dev_info(vlandev);
+                        if (!(vlan->flags & VLAN_FLAG_LOOSE_BINDING))
+                                dev_change_flags(vlandev, flgs | IFF_UP);
+                        netif_stacked_transfer_operstate(dev, vlandev);
                 }
                 break;
 
         case NETDEV_UNREGISTER:
                 /* Delete all VLANs for this dev. */
+                grp->killall = 1;
+
                 for (i = 0; i < VLAN_GROUP_ARRAY_LEN; i++) {
                         vlandev = vlan_group_get_device(grp, i);
                         if (!vlandev)
@@ -538,8 +526,9 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event,
                         if (grp->nr_vlans == 1)
                                 i = VLAN_GROUP_ARRAY_LEN;
 
-                        unregister_vlan_dev(vlandev);
+                        unregister_vlan_dev(vlandev, &list);
                 }
+                unregister_netdevice_many(&list);
                 break;
         }
 
@@ -645,7 +634,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
                 err = -EPERM;
                 if (!capable(CAP_NET_ADMIN))
                         break;
-                unregister_vlan_dev(dev);
+                unregister_vlan_dev(dev, NULL);
                 err = 0;
                 break;
 
@@ -676,47 +665,26 @@ out:
 
 static int vlan_init_net(struct net *net)
 {
+        struct vlan_net *vn = net_generic(net, vlan_net_id);
         int err;
-        struct vlan_net *vn;
-
-        err = -ENOMEM;
-        vn = kzalloc(sizeof(struct vlan_net), GFP_KERNEL);
-        if (vn == NULL)
-                goto err_alloc;
-
-        err = net_assign_generic(net, vlan_net_id, vn);
-        if (err < 0)
-                goto err_assign;
 
         vn->name_type = VLAN_NAME_TYPE_RAW_PLUS_VID_NO_PAD;
 
         err = vlan_proc_init(net);
-        if (err < 0)
-                goto err_proc;
-
-        return 0;
 
-err_proc:
-        /* nothing */
-err_assign:
-        kfree(vn);
-err_alloc:
         return err;
 }
 
 static void vlan_exit_net(struct net *net)
 {
-        struct vlan_net *vn;
-
-        vn = net_generic(net, vlan_net_id);
-        rtnl_kill_links(net, &vlan_link_ops);
         vlan_proc_cleanup(net);
-        kfree(vn);
 }
 
 static struct pernet_operations vlan_net_ops = {
         .init = vlan_init_net,
         .exit = vlan_exit_net,
+        .id   = &vlan_net_id,
+        .size = sizeof(struct vlan_net),
 };
 
 static int __init vlan_proto_init(void)
@@ -726,7 +694,7 @@ static int __init vlan_proto_init(void)
         pr_info("%s v%s %s\n", vlan_fullname, vlan_version, vlan_copyright);
         pr_info("All bugs added by %s\n", vlan_buggyright);
 
-        err = register_pernet_gen_device(&vlan_net_id, &vlan_net_ops);
+        err = register_pernet_subsys(&vlan_net_ops);
         if (err < 0)
                 goto err0;
 
@@ -751,7 +719,7 @@ err4:
 err3:
         unregister_netdevice_notifier(&vlan_notifier_block);
 err2:
-        unregister_pernet_gen_device(vlan_net_id, &vlan_net_ops);
+        unregister_pernet_subsys(&vlan_net_ops);
 err0:
         return err;
 }
@@ -771,7 +739,7 @@ static void __exit vlan_cleanup_module(void)
         for (i = 0; i < VLAN_GRP_HASH_SIZE; i++)
                 BUG_ON(!hlist_empty(&vlan_group_hash[i]));
 
-        unregister_pernet_gen_device(vlan_net_id, &vlan_net_ops);
+        unregister_pernet_subsys(&vlan_net_ops);
         rcu_barrier(); /* Wait for completion of call_rcu()'s */
 
         vlan_gvrp_uninit();
diff --git a/net/8021q/vlan.h b/net/8021q/vlan.h
index 82570bc2a180..5685296017e9 100644
--- a/net/8021q/vlan.h
+++ b/net/8021q/vlan.h
@@ -16,6 +16,21 @@ struct vlan_priority_tci_mapping {
         struct vlan_priority_tci_mapping        *next;
 };
 
+
+/**
+ *      struct vlan_rx_stats - VLAN percpu rx stats
+ *      @rx_packets: number of received packets
+ *      @rx_bytes: number of received bytes
+ *      @multicast: number of received multicast packets
+ *      @rx_errors: number of errors
+ */
+struct vlan_rx_stats {
+        unsigned long rx_packets;
+        unsigned long rx_bytes;
+        unsigned long multicast;
+        unsigned long rx_errors;
+};
+
 /**
  *      struct vlan_dev_info - VLAN private device data
  *      @nr_ingress_mappings: number of ingress priority mappings
@@ -29,6 +44,7 @@ struct vlan_priority_tci_mapping {
  *      @dent: proc dir entry
  *      @cnt_inc_headroom_on_tx: statistic - number of skb expansions on TX
  *      @cnt_encap_on_xmit: statistic - number of skb encapsulations on TX
+ *      @vlan_rx_stats: ptr to percpu rx stats
  */
 struct vlan_dev_info {
         unsigned int                            nr_ingress_mappings;
@@ -45,6 +61,7 @@ struct vlan_dev_info {
         struct proc_dir_entry                   *dent;
         unsigned long                           cnt_inc_headroom_on_tx;
         unsigned long                           cnt_encap_on_xmit;
+        struct vlan_rx_stats                    *vlan_rx_stats;
 };
 
 static inline struct vlan_dev_info *vlan_dev_info(const struct net_device *dev)
@@ -82,14 +99,14 @@ void vlan_dev_get_realdev_name(const struct net_device *dev, char *result);
 int vlan_check_real_dev(struct net_device *real_dev, u16 vlan_id);
 void vlan_setup(struct net_device *dev);
 int register_vlan_dev(struct net_device *dev);
-void unregister_vlan_dev(struct net_device *dev);
+void unregister_vlan_dev(struct net_device *dev, struct list_head *head);
 
 static inline u32 vlan_get_ingress_priority(struct net_device *dev,
                                             u16 vlan_tci)
 {
         struct vlan_dev_info *vip = vlan_dev_info(dev);
 
-        return vip->ingress_priority_map[(vlan_tci >> 13) & 0x7];
+        return vip->ingress_priority_map[(vlan_tci >> VLAN_PRIO_SHIFT) & 0x7];
 }
 
 #ifdef CONFIG_VLAN_8021Q_GVRP
diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c
index 7f7de1a04de6..e75a2f3b10af 100644
--- a/net/8021q/vlan_core.c
+++ b/net/8021q/vlan_core.c
@@ -14,7 +14,7 @@ int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp,
         if (skb_bond_should_drop(skb))
                 goto drop;
 
-        skb->vlan_tci = vlan_tci;
+        __vlan_hwaccel_put_tag(skb, vlan_tci);
         skb->dev = vlan_group_get_device(grp, vlan_tci & VLAN_VID_MASK);
 
         if (!skb->dev)
@@ -31,7 +31,7 @@ EXPORT_SYMBOL(__vlan_hwaccel_rx);
 int vlan_hwaccel_do_receive(struct sk_buff *skb)
 {
         struct net_device *dev = skb->dev;
-        struct net_device_stats *stats;
+        struct vlan_rx_stats     *rx_stats;
 
         skb->dev = vlan_dev_info(dev)->real_dev;
         netif_nit_deliver(skb);
@@ -40,15 +40,17 @@ int vlan_hwaccel_do_receive(struct sk_buff *skb)
         skb->priority = vlan_get_ingress_priority(dev, skb->vlan_tci);
         skb->vlan_tci = 0;
 
-        stats = &dev->stats;
-        stats->rx_packets++;
-        stats->rx_bytes += skb->len;
+        rx_stats = per_cpu_ptr(vlan_dev_info(dev)->vlan_rx_stats,
+                               smp_processor_id());
+
+        rx_stats->rx_packets++;
+        rx_stats->rx_bytes += skb->len;
 
         switch (skb->pkt_type) {
         case PACKET_BROADCAST:
                 break;
         case PACKET_MULTICAST:
-                stats->multicast++;
+                rx_stats->multicast++;
                 break;
         case PACKET_OTHERHOST:
                 /* Our lower layer thinks this is not local, let's make sure.
@@ -74,15 +76,16 @@ u16 vlan_dev_vlan_id(const struct net_device *dev)
 }
 EXPORT_SYMBOL(vlan_dev_vlan_id);
 
-static int vlan_gro_common(struct napi_struct *napi, struct vlan_group *grp,
-                           unsigned int vlan_tci, struct sk_buff *skb)
+static gro_result_t
+vlan_gro_common(struct napi_struct *napi, struct vlan_group *grp,
+                unsigned int vlan_tci, struct sk_buff *skb)
 {
         struct sk_buff *p;
 
         if (skb_bond_should_drop(skb))
                 goto drop;
 
-        skb->vlan_tci = vlan_tci;
+        __vlan_hwaccel_put_tag(skb, vlan_tci);
         skb->dev = vlan_group_get_device(grp, vlan_tci & VLAN_VID_MASK);
 
         if (!skb->dev)
@@ -101,11 +104,12 @@ drop:
         return GRO_DROP;
 }
 
-int vlan_gro_receive(struct napi_struct *napi, struct vlan_group *grp,
-                     unsigned int vlan_tci, struct sk_buff *skb)
+gro_result_t vlan_gro_receive(struct napi_struct *napi, struct vlan_group *grp,
+                              unsigned int vlan_tci, struct sk_buff *skb)
 {
         if (netpoll_rx_on(skb))
-                return vlan_hwaccel_receive_skb(skb, grp, vlan_tci);
+                return vlan_hwaccel_receive_skb(skb, grp, vlan_tci)
+                        ? GRO_DROP : GRO_NORMAL;
 
         skb_gro_reset_offset(skb);
 
@@ -113,17 +117,18 @@ int vlan_gro_receive(struct napi_struct *napi, struct vlan_group *grp,
 }
 EXPORT_SYMBOL(vlan_gro_receive);
 
-int vlan_gro_frags(struct napi_struct *napi, struct vlan_group *grp,
-                   unsigned int vlan_tci)
+gro_result_t vlan_gro_frags(struct napi_struct *napi, struct vlan_group *grp,
+                            unsigned int vlan_tci)
 {
         struct sk_buff *skb = napi_frags_skb(napi);
 
         if (!skb)
-                return NET_RX_DROP;
+                return GRO_DROP;
 
         if (netpoll_rx_on(skb)) {
                 skb->protocol = eth_type_trans(skb, skb->dev);
-                return vlan_hwaccel_receive_skb(skb, grp, vlan_tci);
+                return vlan_hwaccel_receive_skb(skb, grp, vlan_tci)
+                        ? GRO_DROP : GRO_NORMAL;
         }
 
         return napi_frags_finish(napi, skb,
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index 4198ec5c8abc..b7889782047e 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -140,7 +140,7 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
                   struct packet_type *ptype, struct net_device *orig_dev)
 {
         struct vlan_hdr *vhdr;
-        struct net_device_stats *stats;
+        struct vlan_rx_stats *rx_stats;
         u16 vlan_id;
         u16 vlan_tci;
 
@@ -163,9 +163,10 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
                 goto err_unlock;
         }
 
-        stats = &skb->dev->stats;
-        stats->rx_packets++;
-        stats->rx_bytes += skb->len;
+        rx_stats = per_cpu_ptr(vlan_dev_info(dev)->vlan_rx_stats,
+                               smp_processor_id());
+        rx_stats->rx_packets++;
+        rx_stats->rx_bytes += skb->len;
 
         skb_pull_rcsum(skb, VLAN_HLEN);
 
@@ -180,7 +181,7 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
                 break;
 
         case PACKET_MULTICAST:
-                stats->multicast++;
+                rx_stats->multicast++;
                 break;
 
         case PACKET_OTHERHOST:
@@ -200,7 +201,7 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
 
         skb = vlan_check_reorder_header(skb);
         if (!skb) {
-                stats->rx_errors++;
+                rx_stats->rx_errors++;
                 goto err_unlock;
         }
 
@@ -332,7 +333,7 @@ static netdev_tx_t vlan_dev_hard_start_xmit(struct sk_buff *skb,
         } else
                 txq->tx_dropped++;
 
-        return NETDEV_TX_OK;
+        return ret;
 }
 
 static netdev_tx_t vlan_dev_hwaccel_hard_start_xmit(struct sk_buff *skb,
@@ -358,7 +359,7 @@ static netdev_tx_t vlan_dev_hwaccel_hard_start_xmit(struct sk_buff *skb,
         } else
                 txq->tx_dropped++;
 
-        return NETDEV_TX_OK;
+        return ret;
 }
 
 static int vlan_dev_change_mtu(struct net_device *dev, int new_mtu)
@@ -393,7 +394,7 @@ int vlan_dev_set_egress_priority(const struct net_device *dev,
         struct vlan_dev_info *vlan = vlan_dev_info(dev);
         struct vlan_priority_tci_mapping *mp = NULL;
         struct vlan_priority_tci_mapping *np;
-        u32 vlan_qos = (vlan_prio << 13) & 0xE000;
+        u32 vlan_qos = (vlan_prio << VLAN_PRIO_SHIFT) & VLAN_PRIO_MASK;
 
         /* See if a priority mapping exists.. */
         mp = vlan->egress_priority_map[skb_prio & 0xF];
@@ -430,7 +431,8 @@ int vlan_dev_change_flags(const struct net_device *dev, u32 flags, u32 mask)
         struct vlan_dev_info *vlan = vlan_dev_info(dev);
         u32 old_flags = vlan->flags;
 
-        if (mask & ~(VLAN_FLAG_REORDER_HDR | VLAN_FLAG_GVRP))
+        if (mask & ~(VLAN_FLAG_REORDER_HDR | VLAN_FLAG_GVRP |
+                     VLAN_FLAG_LOOSE_BINDING))
                 return -EINVAL;
 
         vlan->flags = (old_flags & ~mask) | (flags & mask);
@@ -455,7 +457,8 @@ static int vlan_dev_open(struct net_device *dev)
         struct net_device *real_dev = vlan->real_dev;
         int err;
 
-        if (!(real_dev->flags & IFF_UP))
+        if (!(real_dev->flags & IFF_UP) &&
+            !(vlan->flags & VLAN_FLAG_LOOSE_BINDING))
                 return -ENETDOWN;
 
         if (compare_ether_addr(dev->dev_addr, real_dev->dev_addr)) {
@@ -626,6 +629,17 @@ static int vlan_dev_fcoe_disable(struct net_device *dev)
                 rc = ops->ndo_fcoe_disable(real_dev);
         return rc;
 }
+
+static int vlan_dev_fcoe_get_wwn(struct net_device *dev, u64 *wwn, int type)
+{
+        struct net_device *real_dev = vlan_dev_info(dev)->real_dev;
+        const struct net_device_ops *ops = real_dev->netdev_ops;
+        int rc = -EINVAL;
+
+        if (ops->ndo_fcoe_get_wwn)
+                rc = ops->ndo_fcoe_get_wwn(real_dev, wwn, type);
+        return rc;
+}
 #endif
 
 static void vlan_dev_change_rx_flags(struct net_device *dev, int change)
@@ -720,6 +734,11 @@ static int vlan_dev_init(struct net_device *dev)
                 subclass = 1;
 
         vlan_dev_set_lockdep_class(dev, subclass);
+
+        vlan_dev_info(dev)->vlan_rx_stats = alloc_percpu(struct vlan_rx_stats);
+        if (!vlan_dev_info(dev)->vlan_rx_stats)
+                return -ENOMEM;
+
         return 0;
 }
 
@@ -729,6 +748,8 @@ static void vlan_dev_uninit(struct net_device *dev)
         struct vlan_dev_info *vlan = vlan_dev_info(dev);
         int i;
 
+        free_percpu(vlan->vlan_rx_stats);
+        vlan->vlan_rx_stats = NULL;
         for (i = 0; i < ARRAY_SIZE(vlan->egress_priority_map); i++) {
                 while ((pm = vlan->egress_priority_map[i]) != NULL) {
                         vlan->egress_priority_map[i] = pm->next;
@@ -764,6 +785,31 @@ static u32 vlan_ethtool_get_flags(struct net_device *dev)
         return dev_ethtool_get_flags(vlan->real_dev);
 }
 
+static struct net_device_stats *vlan_dev_get_stats(struct net_device *dev)
+{
+        struct net_device_stats *stats = &dev->stats;
+
+        dev_txq_stats_fold(dev, stats);
+
+        if (vlan_dev_info(dev)->vlan_rx_stats) {
+                struct vlan_rx_stats *p, rx = {0};
+                int i;
+
+                for_each_possible_cpu(i) {
+                        p = per_cpu_ptr(vlan_dev_info(dev)->vlan_rx_stats, i);
+                        rx.rx_packets += p->rx_packets;
+                        rx.rx_bytes   += p->rx_bytes;
+                        rx.rx_errors  += p->rx_errors;
+                        rx.multicast  += p->multicast;
+                }
+                stats->rx_packets = rx.rx_packets;
+                stats->rx_bytes   = rx.rx_bytes;
+                stats->rx_errors  = rx.rx_errors;
+                stats->multicast  = rx.multicast;
+        }
+        return stats;
+}
+
 static const struct ethtool_ops vlan_ethtool_ops = {
         .get_settings           = vlan_ethtool_get_settings,
         .get_drvinfo            = vlan_ethtool_get_drvinfo,
@@ -786,11 +832,13 @@ static const struct net_device_ops vlan_netdev_ops = {
         .ndo_change_rx_flags    = vlan_dev_change_rx_flags,
         .ndo_do_ioctl           = vlan_dev_ioctl,
         .ndo_neigh_setup        = vlan_dev_neigh_setup,
+        .ndo_get_stats          = vlan_dev_get_stats,
 #if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
         .ndo_fcoe_ddp_setup     = vlan_dev_fcoe_ddp_setup,
         .ndo_fcoe_ddp_done      = vlan_dev_fcoe_ddp_done,
         .ndo_fcoe_enable        = vlan_dev_fcoe_enable,
         .ndo_fcoe_disable       = vlan_dev_fcoe_disable,
+        .ndo_fcoe_get_wwn       = vlan_dev_fcoe_get_wwn,
 #endif
 };
 
@@ -808,11 +856,13 @@ static const struct net_device_ops vlan_netdev_accel_ops = {
         .ndo_change_rx_flags    = vlan_dev_change_rx_flags,
         .ndo_do_ioctl           = vlan_dev_ioctl,
         .ndo_neigh_setup        = vlan_dev_neigh_setup,
+        .ndo_get_stats          = vlan_dev_get_stats,
 #if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
         .ndo_fcoe_ddp_setup     = vlan_dev_fcoe_ddp_setup,
         .ndo_fcoe_ddp_done      = vlan_dev_fcoe_ddp_done,
         .ndo_fcoe_enable        = vlan_dev_fcoe_enable,
         .ndo_fcoe_disable       = vlan_dev_fcoe_disable,
+        .ndo_fcoe_get_wwn       = vlan_dev_fcoe_get_wwn,
 #endif
 };
 
diff --git a/net/8021q/vlan_netlink.c b/net/8021q/vlan_netlink.c
index a91504850195..ddc105734af7 100644
--- a/net/8021q/vlan_netlink.c
+++ b/net/8021q/vlan_netlink.c
@@ -60,7 +60,8 @@ static int vlan_validate(struct nlattr *tb[], struct nlattr *data[])
         if (data[IFLA_VLAN_FLAGS]) {
                 flags = nla_data(data[IFLA_VLAN_FLAGS]);
                 if ((flags->flags & flags->mask) &
-                    ~(VLAN_FLAG_REORDER_HDR | VLAN_FLAG_GVRP))
+                    ~(VLAN_FLAG_REORDER_HDR | VLAN_FLAG_GVRP |
+                      VLAN_FLAG_LOOSE_BINDING))
                         return -EINVAL;
         }
 
@@ -119,7 +120,7 @@ static int vlan_get_tx_queues(struct net *net,
         return 0;
 }
 
-static int vlan_newlink(struct net_device *dev,
+static int vlan_newlink(struct net *src_net, struct net_device *dev,
                         struct nlattr *tb[], struct nlattr *data[])
 {
         struct vlan_dev_info *vlan = vlan_dev_info(dev);
@@ -131,7 +132,7 @@ static int vlan_newlink(struct net_device *dev,
 
         if (!tb[IFLA_LINK])
                 return -EINVAL;
-        real_dev = __dev_get_by_index(dev_net(dev), nla_get_u32(tb[IFLA_LINK]));
+        real_dev = __dev_get_by_index(src_net, nla_get_u32(tb[IFLA_LINK]));
         if (!real_dev)
                 return -ENODEV;
 
diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c
index 6262c335f3c2..9ec1f057c03a 100644
--- a/net/8021q/vlanproc.c
+++ b/net/8021q/vlanproc.c
@@ -201,18 +201,17 @@ int vlan_proc_rem_dev(struct net_device *vlandev)
 
 /* start read of /proc/net/vlan/config */
 static void *vlan_seq_start(struct seq_file *seq, loff_t *pos)
-        __acquires(dev_base_lock)
+        __acquires(rcu)
 {
         struct net_device *dev;
         struct net *net = seq_file_net(seq);
         loff_t i = 1;
 
-        read_lock(&dev_base_lock);
-
+        rcu_read_lock();
         if (*pos == 0)
                 return SEQ_START_TOKEN;
 
-        for_each_netdev(net, dev) {
+        for_each_netdev_rcu(net, dev) {
                 if (!is_vlan_dev(dev))
                         continue;
 
@@ -234,7 +233,7 @@ static void *vlan_seq_next(struct seq_file *seq, void *v, loff_t *pos)
         if (v == SEQ_START_TOKEN)
                 dev = net_device_entry(&net->dev_base_head);
 
-        for_each_netdev_continue(net, dev) {
+        for_each_netdev_continue_rcu(net, dev) {
                 if (!is_vlan_dev(dev))
                         continue;
 
@@ -245,9 +244,9 @@ static void *vlan_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 }
 
 static void vlan_seq_stop(struct seq_file *seq, void *v)
-        __releases(dev_base_lock)
+        __releases(rcu)
 {
-        read_unlock(&dev_base_lock);
+        rcu_read_unlock();
 }
 
 static int vlan_seq_show(struct seq_file *seq, void *v)