matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

iplink: bridge: add support for IFLA_BR_VLAN_DEFAULT_PVID 

This patch implements support for the IFLA_BR_VLAN_DEFAULT_PVID
attribute in iproute2 so it can change the default pvid.

Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
This commit is contained in:
Nikolay Aleksandrov 2016-02-09 00:14:24 +01:00 committed by Stephen Hemminger
parent 0a61aa3963
commit 719832af6c
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ip/iplink_bridge.c
View File

@ -32,6 +32,7 @@ static void print_explain(FILE *f)
" [ group_address ADDRESS ]\n" " [ group_address ADDRESS ]\n"
" [ vlan_filtering VLAN_FILTERING ]\n" " [ vlan_filtering VLAN_FILTERING ]\n"
" [ vlan_protocol VLAN_PROTOCOL ]\n" " [ vlan_protocol VLAN_PROTOCOL ]\n"
" [ vlan_default_pvid VLAN_DEFAULT_PVID ]\n"
"\n" "\n"
"Where: VLAN_PROTOCOL := { 802.1Q | 802.1ad }\n" "Where: VLAN_PROTOCOL := { 802.1Q | 802.1ad }\n"
); );
@ -130,6 +131,15 @@ static int bridge_parse_opt(struct link_util *lu, int argc, char **argv,
if (len < 0) if (len < 0)
return -1; return -1;
addattr_l(n, 1024, IFLA_BR_GROUP_ADDR, llabuf, len); addattr_l(n, 1024, IFLA_BR_GROUP_ADDR, llabuf, len);
} else if (matches(*argv, "vlan_default_pvid") == 0) {
__u16 default_pvid;
NEXT_ARG();
if (get_u16(&default_pvid, *argv, 0))
invarg("invalid vlan_default_pvid", *argv);
addattr16(n, 1024, IFLA_BR_VLAN_DEFAULT_PVID,
default_pvid);
} else if (matches(*argv, "help") == 0) { } else if (matches(*argv, "help") == 0) {
explain(); explain();
return -1; return -1;
@ -251,6 +261,10 @@ static void bridge_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
(int)tv.tv_usec/10000); (int)tv.tv_usec/10000);
} }
if (tb[IFLA_BR_VLAN_DEFAULT_PVID])
fprintf(f, "vlan_default_pvid %u ",
rta_getattr_u16(tb[IFLA_BR_VLAN_DEFAULT_PVID]));
if (tb[IFLA_BR_GROUP_FWD_MASK]) if (tb[IFLA_BR_GROUP_FWD_MASK])
fprintf(f, "group_fwd_mask %#x ", fprintf(f, "group_fwd_mask %#x ",
rta_getattr_u16(tb[IFLA_BR_GROUP_FWD_MASK])); rta_getattr_u16(tb[IFLA_BR_GROUP_FWD_MASK]));