bridge: netlink: add support for vlan_filtering attribute

[linux-2.6-block.git] / net / bridge / br_netlink.c

diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index 793d247ac2ca220e2d3812033b3f4d7b623bc847..6eb683d8e0c5fe7c5c1825e4b57b328556d39cfa 100644 (file)
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -691,9 +691,17 @@ static int br_port_slave_changelink(struct net_device *brdev,
                                    struct nlattr *tb[],
                                    struct nlattr *data[])
 {
+       struct net_bridge *br = netdev_priv(brdev);
+       int ret;
+
        if (!data)
                return 0;
-       return br_setport(br_port_get_rtnl(dev), data);
+
+       spin_lock_bh(&br->lock);
+       ret = br_setport(br_port_get_rtnl(dev), data);
+       spin_unlock_bh(&br->lock);
+
+       return ret;
 }
 
 static int br_port_fill_slave_info(struct sk_buff *skb,
@@ -716,6 +724,7 @@ static const struct nla_policy br_policy[IFLA_BR_MAX + 1] = {
        [IFLA_BR_AGEING_TIME] = { .type = NLA_U32 },
        [IFLA_BR_STP_STATE] = { .type = NLA_U32 },
        [IFLA_BR_PRIORITY] = { .type = NLA_U16 },
+       [IFLA_BR_VLAN_FILTERING] = { .type = NLA_U8 },
 };
 
 static int br_changelink(struct net_device *brdev, struct nlattr *tb[],
@@ -763,6 +772,14 @@ static int br_changelink(struct net_device *brdev, struct nlattr *tb[],
                br_stp_set_bridge_priority(br, priority);
        }
 
+       if (data[IFLA_BR_VLAN_FILTERING]) {
+               u8 vlan_filter = nla_get_u8(data[IFLA_BR_VLAN_FILTERING]);
+
+               err = __br_vlan_filter_toggle(br, vlan_filter);
+               if (err)
+                       return err;
+       }
+
        return 0;
 }
 
@@ -774,6 +791,7 @@ static size_t br_get_size(const struct net_device *brdev)
               nla_total_size(sizeof(u32)) +    /* IFLA_BR_AGEING_TIME */
               nla_total_size(sizeof(u32)) +    /* IFLA_BR_STP_STATE */
               nla_total_size(sizeof(u16)) +    /* IFLA_BR_PRIORITY */
+              nla_total_size(sizeof(u8)) +     /* IFLA_BR_VLAN_FILTERING */
               0;
 }
 
@@ -786,13 +804,15 @@ static int br_fill_info(struct sk_buff *skb, const struct net_device *brdev)
        u32 ageing_time = jiffies_to_clock_t(br->ageing_time);
        u32 stp_enabled = br->stp_enabled;
        u16 priority = (br->bridge_id.prio[0] << 8) | br->bridge_id.prio[1];
+       u8 vlan_enabled = br_vlan_enabled(br);
 
        if (nla_put_u32(skb, IFLA_BR_FORWARD_DELAY, forward_delay) ||
            nla_put_u32(skb, IFLA_BR_HELLO_TIME, hello_time) ||
            nla_put_u32(skb, IFLA_BR_MAX_AGE, age_time) ||
            nla_put_u32(skb, IFLA_BR_AGEING_TIME, ageing_time) ||
            nla_put_u32(skb, IFLA_BR_STP_STATE, stp_enabled) ||
-           nla_put_u16(skb, IFLA_BR_PRIORITY, priority))
+           nla_put_u16(skb, IFLA_BR_PRIORITY, priority) ||
+           nla_put_u8(skb, IFLA_BR_VLAN_FILTERING, vlan_enabled))
                return -EMSGSIZE;
 
        return 0;