Merge branch 'depends/rmk/gpio' into next/devel

[firefly-linux-kernel-4.4.55.git] / net / 8021q / vlan.c

diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index 917ecb93ea28d477d75c729accac39eacbdfa752..8970ba139d73f84f81ea3577621d9959bec267b6 100644 (file)
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -18,6 +18,8 @@
  *             2 of the License, or (at your option) any later version.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/capability.h>
 #include <linux/module.h>
 #include <linux/netdevice.h>
@@ -132,8 +134,6 @@ void unregister_vlan_dev(struct net_device *dev, struct list_head *head)
                vlan_gvrp_uninit_applicant(real_dev);
 
                rcu_assign_pointer(real_dev->vlgrp, NULL);
-               if (ops->ndo_vlan_rx_register)
-                       ops->ndo_vlan_rx_register(real_dev, NULL);
 
                /* Free the group, after all cpu's are done. */
                call_rcu(&grp->rcu, vlan_rcu_free);
@@ -149,13 +149,13 @@ int vlan_check_real_dev(struct net_device *real_dev, u16 vlan_id)
        const struct net_device_ops *ops = real_dev->netdev_ops;
 
        if (real_dev->features & NETIF_F_VLAN_CHALLENGED) {
-               pr_info("8021q: VLANs not supported on %s\n", name);
+               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("8021q: Device %s has buggy VLAN hw accel\n", name);
+               pr_info("Device %s has buggy VLAN hw accel\n", name);
                return -EOPNOTSUPP;
        }
 
@@ -205,8 +205,6 @@ int register_vlan_dev(struct net_device *dev)
        grp->nr_vlans++;
 
        if (ngrp) {
-               if (ops->ndo_vlan_rx_register && (real_dev->features & NETIF_F_HW_VLAN_RX))
-                       ops->ndo_vlan_rx_register(real_dev, ngrp);
                rcu_assign_pointer(real_dev->vlgrp, ngrp);
        }
        if (real_dev->features & NETIF_F_HW_VLAN_FILTER)
@@ -344,13 +342,12 @@ static void __vlan_device_event(struct net_device *dev, unsigned long event)
        case NETDEV_CHANGENAME:
                vlan_proc_rem_dev(dev);
                if (vlan_proc_add_dev(dev) < 0)
-                       pr_warning("8021q: failed to change proc name for %s\n",
-                                       dev->name);
+                       pr_warn("failed to change proc name for %s\n",
+                               dev->name);
                break;
        case NETDEV_REGISTER:
                if (vlan_proc_add_dev(dev) < 0)
-                       pr_warning("8021q: failed to add proc entry for %s\n",
-                                       dev->name);
+                       pr_warn("failed to add proc entry for %s\n", dev->name);
                break;
        case NETDEV_UNREGISTER:
                vlan_proc_rem_dev(dev);
@@ -374,7 +371,7 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event,
        if ((event == NETDEV_UP) &&
            (dev->features & NETIF_F_HW_VLAN_FILTER) &&
            dev->netdev_ops->ndo_vlan_rx_add_vid) {
-               pr_info("8021q: adding VLAN 0 to HW filter on device %s\n",
+               pr_info("adding VLAN 0 to HW filter on device %s\n",
                        dev->name);
                dev->netdev_ops->ndo_vlan_rx_add_vid(dev, 0);
        }