1 files changed, 12 insertions, 3 deletions

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index d9d1e2bac1d..dce8f0009a1 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -148,6 +148,8 @@ static void del_nbp(struct net_bridge_port *p)
 
         netdev_rx_handler_unregister(dev);
 
+        netdev_set_master(dev, NULL);
+
         br_multicast_del_port(p);
 
         kobject_uevent(&p->kobj, KOBJ_REMOVE);
@@ -365,7 +367,7 @@ int br_min_mtu(const struct net_bridge *br)
 void br_features_recompute(struct net_bridge *br)
 {
         struct net_bridge_port *p;
-        unsigned long features, mask;
+        u32 features, mask;
 
         features = mask = br->feature_mask;
         if (list_empty(&br->port_list))
@@ -379,7 +381,7 @@ void br_features_recompute(struct net_bridge *br)
         }
 
 done:
-        br->dev->features = netdev_fix_features(features, NULL);
+        br->dev->features = netdev_fix_features(br->dev, features);
 }
 
 /* called with RTNL */
@@ -429,10 +431,14 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
         if (br_netpoll_info(br) && ((err = br_netpoll_enable(p))))
                 goto err3;
 
-        err = netdev_rx_handler_register(dev, br_handle_frame, p);
+        err = netdev_set_master(dev, br->dev);
         if (err)
                 goto err3;
 
+        err = netdev_rx_handler_register(dev, br_handle_frame, p);
+        if (err)
+                goto err4;
+
         dev->priv_flags |= IFF_BRIDGE_PORT;
 
         dev_disable_lro(dev);
@@ -455,6 +461,9 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
         kobject_uevent(&p->kobj, KOBJ_ADD);
 
         return 0;
+
+err4:
+        netdev_set_master(dev, NULL);
 err3:
         sysfs_remove_link(br->ifobj, p->dev->name);
 err2: