Merge branch 'master' into staging-next

[karo-tx-linux.git] / net / bridge / br_if.c

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 4bf02adb5dc2433709ce06d6f4b4fdc48e171dd0..cffe1d666ba11636cc7e3d374018edf7ac31535b 100644 (file)
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -61,7 +61,7 @@ static int port_cost(struct net_device *dev)
 }
 
 
-/* Check for port carrier transistions. */
+/* Check for port carrier transitions. */
 void br_port_carrier_check(struct net_bridge_port *p)
 {
        struct net_device *dev = p->dev;
@@ -455,18 +455,3 @@ int br_del_if(struct net_bridge *br, struct net_device *dev)
 
        return 0;
 }
-
-void __net_exit br_net_exit(struct net *net)
-{
-       struct net_device *dev;
-       LIST_HEAD(list);
-
-       rtnl_lock();
-       for_each_netdev(net, dev)
-               if (dev->priv_flags & IFF_EBRIDGE)
-                       br_dev_delete(dev, &list);
-
-       unregister_netdevice_many(&list);
-       rtnl_unlock();
-
-}