bridge: Add netlink interface to configure vlans on bridge ports

[~andy/linux] / net / bridge / br_if.c

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 37fe693471a84d6815b31a5efcadfd836c0be254..335c60cebfd12ef2150bddb522cd70c5d8aea077 100644 (file)
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -23,6 +23,7 @@
 #include <linux/if_ether.h>
 #include <linux/slab.h>
 #include <net/sock.h>
+#include <linux/if_vlan.h>
 
 #include "br_private.h"
 
@@ -66,14 +67,14 @@ void br_port_carrier_check(struct net_bridge_port *p)
        struct net_device *dev = p->dev;
        struct net_bridge *br = p->br;
 
-       if (netif_running(dev) && netif_carrier_ok(dev))
+       if (netif_running(dev) && netif_oper_up(dev))
                p->path_cost = port_cost(dev);
 
        if (!netif_running(br->dev))
                return;
 
        spin_lock_bh(&br->lock);
-       if (netif_running(dev) && netif_carrier_ok(dev)) {
+       if (netif_running(dev) && netif_oper_up(dev)) {
                if (p->state == BR_STATE_DISABLED)
                        br_stp_enable_port(p);
        } else {
@@ -139,6 +140,7 @@ static void del_nbp(struct net_bridge_port *p)
 
        br_ifinfo_notify(RTM_DELLINK, p);
 
+       nbp_vlan_flush(p);
        br_fdb_delete_by_port(br, p, 1);
 
        list_del_rcu(&p->list);
@@ -148,7 +150,7 @@ static void del_nbp(struct net_bridge_port *p)
        netdev_rx_handler_unregister(dev);
        synchronize_net();
 
-       netdev_set_master(dev, NULL);
+       netdev_upper_dev_unlink(dev, br->dev);
 
        br_multicast_del_port(p);
 
@@ -364,7 +366,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
        if (br_netpoll_info(br) && ((err = br_netpoll_enable(p, GFP_KERNEL))))
                goto err3;
 
-       err = netdev_set_master(dev, br->dev);
+       err = netdev_master_upper_dev_link(dev, br->dev);
        if (err)
                goto err4;
 
@@ -383,7 +385,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
        spin_lock_bh(&br->lock);
        changed_addr = br_stp_recalculate_bridge_id(br);
 
-       if ((dev->flags & IFF_UP) && netif_carrier_ok(dev) &&
+       if (netif_running(dev) && netif_oper_up(dev) &&
            (br->dev->flags & IFF_UP))
                br_stp_enable_port(p);
        spin_unlock_bh(&br->lock);
@@ -403,7 +405,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
        return 0;
 
 err5:
-       netdev_set_master(dev, NULL);
+       netdev_upper_dev_unlink(dev, br->dev);
 err4:
        br_netpoll_disable(p);
 err3: