From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nikolay Aleksandrov Subject: [PATCH iproute2 06/21] iplink: bridge: add support for IFLA_BR_VLAN_DEFAULT_PVID Date: Mon, 8 Feb 2016 12:55:12 +0100 Message-ID: <1454932527-30569-7-git-send-email-razor@blackwall.org> References: <1454932527-30569-1-git-send-email-razor@blackwall.org> Cc: roopa@cumulusnetworks.com, stephen@networkplumber.org, Nikolay Aleksandrov To: netdev@vger.kernel.org Return-path: Received: from mail-wm0-f47.google.com ([74.125.82.47]:36141 "EHLO mail-wm0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752237AbcBHL4O (ORCPT ); Mon, 8 Feb 2016 06:56:14 -0500 Received: by mail-wm0-f47.google.com with SMTP id p63so109813591wmp.1 for ; Mon, 08 Feb 2016 03:56:14 -0800 (PST) In-Reply-To: <1454932527-30569-1-git-send-email-razor@blackwall.org> Sender: netdev-owner@vger.kernel.org List-ID: From: Nikolay Aleksandrov 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 3d343f7649fe..e8bc66b498b3 100644 --- a/ip/iplink_bridge.c +++ b/ip/iplink_bridge.c @@ -31,6 +31,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" ); @@ -129,6 +130,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; @@ -232,6 +242,10 @@ static void bridge_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[]) fprintf(f, "gc_timer %llu ", rta_getattr_u64(tb[IFLA_BR_GC_TIMER])); + 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])); -- 2.4.3