3 files changed, 12 insertions, 12 deletions

diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index 07a07770c8b..1a99c4e04e8 100644
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -157,6 +157,7 @@ static const struct ethtool_ops br_ethtool_ops = {
         .get_tso        = ethtool_op_get_tso,
         .set_tso        = br_set_tso,
         .get_ufo        = ethtool_op_get_ufo,
+        .set_ufo        = ethtool_op_set_ufo,
         .get_flags      = ethtool_op_get_flags,
 };
 
diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 4a9f5273265..a6f74b2b957 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -154,7 +154,7 @@ static void del_nbp(struct net_bridge_port *p)
 }
 
 /* called with RTNL */
-static void del_br(struct net_bridge *br)
+static void del_br(struct net_bridge *br, struct list_head *head)
 {
         struct net_bridge_port *p, *n;
 
@@ -165,7 +165,7 @@ static void del_br(struct net_bridge *br)
         del_timer_sync(&br->gc_timer);
 
         br_sysfs_delbr(br->dev);
-        unregister_netdevice(br->dev);
+        unregister_netdevice_queue(br->dev, head);
 }
 
 static struct net_device *new_bridge_dev(struct net *net, const char *name)
@@ -323,7 +323,7 @@ int br_del_bridge(struct net *net, const char *name)
         }
 
         else
-                del_br(netdev_priv(dev));
+                del_br(netdev_priv(dev), NULL);
 
         rtnl_unlock();
         return ret;
@@ -466,15 +466,14 @@ int br_del_if(struct net_bridge *br, struct net_device *dev)
 void br_net_exit(struct net *net)
 {
         struct net_device *dev;
+        LIST_HEAD(list);
 
         rtnl_lock();
-restart:
-        for_each_netdev(net, dev) {
-                if (dev->priv_flags & IFF_EBRIDGE) {
-                        del_br(netdev_priv(dev));
-                        goto restart;
-                }
-        }
+        for_each_netdev(net, dev)
+                if (dev->priv_flags & IFF_EBRIDGE)
+                        del_br(netdev_priv(dev), &list);
+
+        unregister_netdevice_many(&list);
         rtnl_unlock();
 
 }
diff --git a/net/bridge/br_ioctl.c b/net/bridge/br_ioctl.c
index 6a6433daaf2..2af6e4a9026 100644
--- a/net/bridge/br_ioctl.c
+++ b/net/bridge/br_ioctl.c
@@ -81,6 +81,7 @@ static int get_fdb_entries(struct net_bridge *br, void __user *userbuf,
         return num;
 }
 
+/* called with RTNL */
 static int add_del_if(struct net_bridge *br, int ifindex, int isadd)
 {
         struct net_device *dev;
@@ -89,7 +90,7 @@ static int add_del_if(struct net_bridge *br, int ifindex, int isadd)
         if (!capable(CAP_NET_ADMIN))
                 return -EPERM;
 
-        dev = dev_get_by_index(dev_net(br->dev), ifindex);
+        dev = __dev_get_by_index(dev_net(br->dev), ifindex);
         if (dev == NULL)
                 return -EINVAL;
 
@@ -98,7 +99,6 @@ static int add_del_if(struct net_bridge *br, int ifindex, int isadd)
         else
                 ret = br_del_if(br, dev);
 
-        dev_put(dev);
         return ret;
 }