luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bridge: support for multiple vlans and vlan ranges in setlink and dellink requests

Browse Source 
This patch changes bridge IFLA_AF_SPEC netlink attribute parser to
look for more than one IFLA_BRIDGE_VLAN_INFO attribute. This allows
userspace to pack more than one vlan in the setlink msg.

The dumps were already sending more than one vlan info in the getlink msg.

This patch also adds bridge_vlan_info flags BRIDGE_VLAN_INFO_RANGE_BEGIN and
BRIDGE_VLAN_INFO_RANGE_END to indicate start and end of vlan range

This patch also deletes unused ifla_br_policy.

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Roopa Prabhu 2015-01-10 07:31:12 -08:00 committed by David S. Miller
parent dd2e8bf586
commit bdced7ef78
2 changed files with 72 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/uapi/linux/if_bridge.h
View File

@ -125,6 +125,8 @@ enum {
#define BRIDGE_VLAN_INFO_MASTER (1<<0) /* Operate on Bridge device as well */ #define BRIDGE_VLAN_INFO_MASTER (1<<0) /* Operate on Bridge device as well */
#define BRIDGE_VLAN_INFO_PVID (1<<1) /* VLAN is PVID, ingress untagged */ #define BRIDGE_VLAN_INFO_PVID (1<<1) /* VLAN is PVID, ingress untagged */
#define BRIDGE_VLAN_INFO_UNTAGGED (1<<2) /* VLAN egresses untagged */ #define BRIDGE_VLAN_INFO_UNTAGGED (1<<2) /* VLAN egresses untagged */
#define BRIDGE_VLAN_INFO_RANGE_BEGIN (1<<3) /* VLAN is start of vlan range */
#define BRIDGE_VLAN_INFO_RANGE_END (1<<4) /* VLAN is end of vlan range */
struct bridge_vlan_info { struct bridge_vlan_info {
__u16 flags; __u16 flags;

108
net/bridge/br_netlink.c
View File

@ -218,57 +218,89 @@ int br_getlink(struct sk_buff *skb, u32 pid, u32 seq,
return err; return err;
} }
static const struct nla_policy ifla_br_policy[IFLA_MAX+1] = { static int br_vlan_info(struct net_bridge *br, struct net_bridge_port *p,
[IFLA_BRIDGE_FLAGS] = { .type = NLA_U16 }, int cmd, struct bridge_vlan_info *vinfo)
[IFLA_BRIDGE_MODE] = { .type = NLA_U16 }, {
[IFLA_BRIDGE_VLAN_INFO] = { .type = NLA_BINARY, int err = 0;
.len = sizeof(struct bridge_vlan_info), },
}; switch (cmd) {
case RTM_SETLINK:
if (p) {
err = nbp_vlan_add(p, vinfo->vid, vinfo->flags);
if (err)
break;
if (vinfo->flags & BRIDGE_VLAN_INFO_MASTER)
err = br_vlan_add(p->br, vinfo->vid,
vinfo->flags);
} else {
err = br_vlan_add(br, vinfo->vid, vinfo->flags);
}
break;
case RTM_DELLINK:
if (p) {
nbp_vlan_delete(p, vinfo->vid);
if (vinfo->flags & BRIDGE_VLAN_INFO_MASTER)
br_vlan_delete(p->br, vinfo->vid);
} else {
br_vlan_delete(br, vinfo->vid);
}
break;
}
return err;
}
static int br_afspec(struct net_bridge *br, static int br_afspec(struct net_bridge *br,
struct net_bridge_port *p, struct net_bridge_port *p,
struct nlattr *af_spec, struct nlattr *af_spec,
int cmd) int cmd)
{ {
struct nlattr *tb[IFLA_BRIDGE_MAX+1]; struct bridge_vlan_info *vinfo_start = NULL;
struct bridge_vlan_info *vinfo = NULL;
struct nlattr *attr;
int err = 0; int err = 0;
int rem;
err = nla_parse_nested(tb, IFLA_BRIDGE_MAX, af_spec, ifla_br_policy); nla_for_each_nested(attr, af_spec, rem) {
if (err) if (nla_type(attr) != IFLA_BRIDGE_VLAN_INFO)
return err; continue;
if (nla_len(attr) != sizeof(struct bridge_vlan_info))
if (tb[IFLA_BRIDGE_VLAN_INFO]) {
struct bridge_vlan_info *vinfo;
vinfo = nla_data(tb[IFLA_BRIDGE_VLAN_INFO]);
if (!vinfo->vid || vinfo->vid >= VLAN_VID_MASK)
return -EINVAL; return -EINVAL;
vinfo = nla_data(attr);
if (vinfo->flags & BRIDGE_VLAN_INFO_RANGE_BEGIN) {
if (vinfo_start)
return -EINVAL;
vinfo_start = vinfo;
continue;
}
switch (cmd) { if (vinfo_start) {
case RTM_SETLINK: struct bridge_vlan_info tmp_vinfo;
if (p) { int v;
err = nbp_vlan_add(p, vinfo->vid, vinfo->flags);
if (!(vinfo->flags & BRIDGE_VLAN_INFO_RANGE_END))
return -EINVAL;
if (vinfo->vid <= vinfo_start->vid)
return -EINVAL;
memcpy(&tmp_vinfo, vinfo_start,
sizeof(struct bridge_vlan_info));
for (v = vinfo_start->vid; v <= vinfo->vid; v++) {
tmp_vinfo.vid = v;
err = br_vlan_info(br, p, cmd, &tmp_vinfo);
if (err) if (err)
break; break;
}
if (vinfo->flags & BRIDGE_VLAN_INFO_MASTER) vinfo_start = NULL;
err = br_vlan_add(p->br, vinfo->vid, } else {
vinfo->flags); err = br_vlan_info(br, p, cmd, vinfo);
} else
err = br_vlan_add(br, vinfo->vid, vinfo->flags);
break;
case RTM_DELLINK:
if (p) {
nbp_vlan_delete(p, vinfo->vid);
if (vinfo->flags & BRIDGE_VLAN_INFO_MASTER)
br_vlan_delete(p->br, vinfo->vid);
} else
br_vlan_delete(br, vinfo->vid);
break;
} }
if (err)
break;
} }
return err; return err;