These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / net / bridge / br.c

diff --git a/kernel/net/bridge/br.c b/kernel/net/bridge/br.c
index 02c24cf..3addc05 100644 (file)
--- a/kernel/net/bridge/br.c
+++ b/kernel/net/bridge/br.c
@@ -121,16 +121,16 @@ static struct notifier_block br_device_notifier = {
        .notifier_call = br_device_event
 };
 
-static int br_netdev_switch_event(struct notifier_block *unused,
-                                 unsigned long event, void *ptr)
+/* called with RTNL */
+static int br_switchdev_event(struct notifier_block *unused,
+                             unsigned long event, void *ptr)
 {
-       struct net_device *dev = netdev_switch_notifier_info_to_dev(ptr);
+       struct net_device *dev = switchdev_notifier_info_to_dev(ptr);
        struct net_bridge_port *p;
        struct net_bridge *br;
-       struct netdev_switch_notifier_fdb_info *fdb_info;
+       struct switchdev_notifier_fdb_info *fdb_info;
        int err = NOTIFY_DONE;
 
-       rtnl_lock();
        p = br_port_get_rtnl(dev);
        if (!p)
                goto out;
@@ -138,14 +138,14 @@ static int br_netdev_switch_event(struct notifier_block *unused,
        br = p->br;
 
        switch (event) {
-       case NETDEV_SWITCH_FDB_ADD:
+       case SWITCHDEV_FDB_ADD:
                fdb_info = ptr;
                err = br_fdb_external_learn_add(br, p, fdb_info->addr,
                                                fdb_info->vid);
                if (err)
                        err = notifier_from_errno(err);
                break;
-       case NETDEV_SWITCH_FDB_DEL:
+       case SWITCHDEV_FDB_DEL:
                fdb_info = ptr;
                err = br_fdb_external_learn_del(br, p, fdb_info->addr,
                                                fdb_info->vid);
@@ -155,12 +155,11 @@ static int br_netdev_switch_event(struct notifier_block *unused,
        }
 
 out:
-       rtnl_unlock();
        return err;
 }
 
-static struct notifier_block br_netdev_switch_notifier = {
-       .notifier_call = br_netdev_switch_event,
+static struct notifier_block br_switchdev_notifier = {
+       .notifier_call = br_switchdev_event,
 };
 
 static void __net_exit br_net_exit(struct net *net)
@@ -214,7 +213,7 @@ static int __init br_init(void)
        if (err)
                goto err_out3;
 
-       err = register_netdev_switch_notifier(&br_netdev_switch_notifier);
+       err = register_switchdev_notifier(&br_switchdev_notifier);
        if (err)
                goto err_out4;
 
@@ -235,7 +234,7 @@ static int __init br_init(void)
        return 0;
 
 err_out5:
-       unregister_netdev_switch_notifier(&br_netdev_switch_notifier);
+       unregister_switchdev_notifier(&br_switchdev_notifier);
 err_out4:
        unregister_netdevice_notifier(&br_device_notifier);
 err_out3:
@@ -253,7 +252,7 @@ static void __exit br_deinit(void)
 {
        stp_proto_unregister(&br_stp_proto);
        br_netlink_fini();
-       unregister_netdev_switch_notifier(&br_netdev_switch_notifier);
+       unregister_switchdev_notifier(&br_switchdev_notifier);
        unregister_netdevice_notifier(&br_device_notifier);
        brioctl_set(NULL);
        unregister_pernet_subsys(&br_net_ops);