|
 |
4aca6e |
From f4ee3de83773cd4b84c2ffe3639c2f9558005c23 Mon Sep 17 00:00:00 2001
|
|
|
4aca6e |
From: Phil Sutter <psutter@redhat.com>
|
|
|
4aca6e |
Date: Tue, 28 Feb 2017 16:12:00 +0100
|
|
|
4aca6e |
Subject: [PATCH] iplink: bridge: add support for IFLA_BR_VLAN_DEFAULT_PVID
|
|
|
4aca6e |
|
|
|
4aca6e |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1417289
|
|
|
4aca6e |
Upstream Status: iproute2.git commit 719832af6c862
|
|
|
4aca6e |
|
|
|
4aca6e |
commit 719832af6c862a04247f28c73b72bf0eea4c7984
|
|
|
4aca6e |
Author: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
|
|
|
4aca6e |
Date: Tue Feb 9 00:14:24 2016 +0100
|
|
|
4aca6e |
|
|
|
4aca6e |
iplink: bridge: add support for IFLA_BR_VLAN_DEFAULT_PVID
|
|
|
4aca6e |
|
|
|
4aca6e |
This patch implements support for the IFLA_BR_VLAN_DEFAULT_PVID
|
|
|
4aca6e |
attribute in iproute2 so it can change the default pvid.
|
|
|
4aca6e |
|
|
|
4aca6e |
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
|
|
|
4aca6e |
---
|
|
|
4aca6e |
ip/iplink_bridge.c | 14 ++++++++++++++
|
|
|
4aca6e |
1 file changed, 14 insertions(+)
|
|
|
4aca6e |
|
|
|
4aca6e |
diff --git a/ip/iplink_bridge.c b/ip/iplink_bridge.c
|
|
|
4aca6e |
index 6ef6c4b..da3a063 100644
|
|
|
4aca6e |
--- a/ip/iplink_bridge.c
|
|
|
4aca6e |
+++ b/ip/iplink_bridge.c
|
|
|
4aca6e |
@@ -32,6 +32,7 @@ static void print_explain(FILE *f)
|
|
|
4aca6e |
" [ group_address ADDRESS ]\n"
|
|
|
4aca6e |
" [ vlan_filtering VLAN_FILTERING ]\n"
|
|
|
4aca6e |
" [ vlan_protocol VLAN_PROTOCOL ]\n"
|
|
|
4aca6e |
+ " [ vlan_default_pvid VLAN_DEFAULT_PVID ]\n"
|
|
|
4aca6e |
"\n"
|
|
|
4aca6e |
"Where: VLAN_PROTOCOL := { 802.1Q | 802.1ad }\n"
|
|
|
4aca6e |
);
|
|
|
4aca6e |
@@ -136,6 +137,15 @@ static int bridge_parse_opt(struct link_util *lu, int argc, char **argv,
|
|
|
4aca6e |
if (len < 0)
|
|
|
4aca6e |
return -1;
|
|
|
4aca6e |
addattr_l(n, 1024, IFLA_BR_GROUP_ADDR, llabuf, len);
|
|
|
4aca6e |
+ } else if (matches(*argv, "vlan_default_pvid") == 0) {
|
|
|
4aca6e |
+ __u16 default_pvid;
|
|
|
4aca6e |
+
|
|
|
4aca6e |
+ NEXT_ARG();
|
|
|
4aca6e |
+ if (get_u16(&default_pvid, *argv, 0))
|
|
|
4aca6e |
+ invarg("invalid vlan_default_pvid", *argv);
|
|
|
4aca6e |
+
|
|
|
4aca6e |
+ addattr16(n, 1024, IFLA_BR_VLAN_DEFAULT_PVID,
|
|
|
4aca6e |
+ default_pvid);
|
|
|
4aca6e |
} else if (matches(*argv, "help") == 0) {
|
|
|
4aca6e |
explain();
|
|
|
4aca6e |
return -1;
|
|
|
4aca6e |
@@ -257,6 +267,10 @@ static void bridge_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
|
|
|
4aca6e |
(int)tv.tv_usec/10000);
|
|
|
4aca6e |
}
|
|
|
4aca6e |
|
|
|
4aca6e |
+ if (tb[IFLA_BR_VLAN_DEFAULT_PVID])
|
|
|
4aca6e |
+ fprintf(f, "vlan_default_pvid %u ",
|
|
|
4aca6e |
+ rta_getattr_u16(tb[IFLA_BR_VLAN_DEFAULT_PVID]));
|
|
|
4aca6e |
+
|
|
|
4aca6e |
if (tb[IFLA_BR_GROUP_FWD_MASK])
|
|
|
4aca6e |
fprintf(f, "group_fwd_mask %#x ",
|
|
|
4aca6e |
rta_getattr_u16(tb[IFLA_BR_GROUP_FWD_MASK]));
|
|
|
4aca6e |
--
|
|
|
4aca6e |
1.8.3.1
|
|
|
4aca6e |
|