From f4ee3de83773cd4b84c2ffe3639c2f9558005c23 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Tue, 28 Feb 2017 16:12:00 +0100 Subject: [PATCH] iplink: bridge: add support for IFLA_BR_VLAN_DEFAULT_PVID Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1417289 Upstream Status: iproute2.git commit 719832af6c862 commit 719832af6c862a04247f28c73b72bf0eea4c7984 Author: Nikolay Aleksandrov Date: Tue Feb 9 00:14:24 2016 +0100 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 --- ip/iplink_bridge.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/ip/iplink_bridge.c b/ip/iplink_bridge.c index 6ef6c4b..da3a063 100644 --- a/ip/iplink_bridge.c +++ b/ip/iplink_bridge.c @@ -32,6 +32,7 @@ static void print_explain(FILE *f) " [ group_address ADDRESS ]\n" " [ vlan_filtering VLAN_FILTERING ]\n" " [ vlan_protocol VLAN_PROTOCOL ]\n" + " [ vlan_default_pvid VLAN_DEFAULT_PVID ]\n" "\n" "Where: VLAN_PROTOCOL := { 802.1Q | 802.1ad }\n" ); @@ -136,6 +137,15 @@ static int bridge_parse_opt(struct link_util *lu, int argc, char **argv, if (len < 0) return -1; 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) { explain(); return -1; @@ -257,6 +267,10 @@ static void bridge_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[]) (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]) fprintf(f, "group_fwd_mask %#x ", rta_getattr_u16(tb[IFLA_BR_GROUP_FWD_MASK])); -- 1.8.3.1