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

iplink: bridge: add support for IFLA_BR_GROUP_FWD_MASK 

This patch implements support for the IFLA_BR_GROUP_FWD_MASK attribute
in iproute2 so it can change the group forwarding mask.

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

13
ip/iplink_bridge.c
View File

@ -28,6 +28,7 @@ static void print_explain(FILE *f)
" [ ageing_time AGEING_TIME ]\n" " [ ageing_time AGEING_TIME ]\n"
" [ stp_state STP_STATE ]\n" " [ stp_state STP_STATE ]\n"
" [ priority PRIORITY ]\n" " [ priority PRIORITY ]\n"
" [ group_fwd_mask MASK ]\n"
" [ vlan_filtering VLAN_FILTERING ]\n" " [ vlan_filtering VLAN_FILTERING ]\n"
" [ vlan_protocol VLAN_PROTOCOL ]\n" " [ vlan_protocol VLAN_PROTOCOL ]\n"
"\n" "\n"
@ -111,6 +112,14 @@ static int bridge_parse_opt(struct link_util *lu, int argc, char **argv,
return -1; return -1;
} }
addattr16(n, 1024, IFLA_BR_VLAN_PROTOCOL, vlan_proto); addattr16(n, 1024, IFLA_BR_VLAN_PROTOCOL, vlan_proto);
} else if (matches(*argv, "group_fwd_mask") == 0) {
__u16 fwd_mask;
NEXT_ARG();
if (get_u16(&fwd_mask, *argv, 0))
invarg("invalid group_fwd_mask", *argv);
addattr16(n, 1024, IFLA_BR_GROUP_FWD_MASK, fwd_mask);
} else if (matches(*argv, "help") == 0) { } else if (matches(*argv, "help") == 0) {
explain(); explain();
return -1; return -1;
@ -231,6 +240,10 @@ static void bridge_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
fprintf(f, "gc_timer %4i.%.2i ", (int)tv.tv_sec, fprintf(f, "gc_timer %4i.%.2i ", (int)tv.tv_sec,
(int)tv.tv_usec/10000); (int)tv.tv_usec/10000);
} }
if (tb[IFLA_BR_GROUP_FWD_MASK])
fprintf(f, "group_fwd_mask %#x ",
rta_getattr_u16(tb[IFLA_BR_GROUP_FWD_MASK]));
} }
static void bridge_print_help(struct link_util *lu, int argc, char **argv, static void bridge_print_help(struct link_util *lu, int argc, char **argv,