|
 |
4aca6e |
From 739809454864ecec6098a849c009526fc59d44d3 Mon Sep 17 00:00:00 2001
|
|
|
4aca6e |
From: Phil Sutter <psutter@redhat.com>
|
|
|
4aca6e |
Date: Tue, 28 Feb 2017 16:09:46 +0100
|
|
|
4aca6e |
Subject: [PATCH] iproute2: bridge: support vlan range adds
|
|
|
4aca6e |
|
|
|
4aca6e |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1417289
|
|
|
4aca6e |
Upstream Status: iproute2.git commit 3ac0d36ddde97
|
|
|
4aca6e |
|
|
|
4aca6e |
commit 3ac0d36ddde9715a8d027a919eb564f7b42c6c40
|
|
|
4aca6e |
Author: Roopa Prabhu <roopa@cumulusnetworks.com>
|
|
|
4aca6e |
Date: Sun Jan 25 18:26:24 2015 -0800
|
|
|
4aca6e |
|
|
|
4aca6e |
iproute2: bridge: support vlan range adds
|
|
|
4aca6e |
|
|
|
4aca6e |
This patch adds vlan range support to bridge add command
|
|
|
4aca6e |
using the newly added vinfo flags BRIDGE_VLAN_INFO_RANGE_BEGIN and
|
|
|
4aca6e |
BRIDGE_VLAN_INFO_RANGE_END.
|
|
|
4aca6e |
|
|
|
4aca6e |
$bridge vlan show
|
|
|
4aca6e |
port vlan ids
|
|
|
4aca6e |
br0 1 PVID Egress Untagged
|
|
|
4aca6e |
|
|
|
4aca6e |
dummy0 1 PVID Egress Untagged
|
|
|
4aca6e |
|
|
|
4aca6e |
$bridge vlan add vid 10-15 dev dummy0
|
|
|
4aca6e |
port vlan ids
|
|
|
4aca6e |
br0 1 PVID Egress Untagged
|
|
|
4aca6e |
|
|
|
4aca6e |
dummy0 1 PVID Egress Untagged
|
|
|
4aca6e |
10
|
|
|
4aca6e |
11
|
|
|
4aca6e |
12
|
|
|
4aca6e |
13
|
|
|
4aca6e |
14
|
|
|
4aca6e |
15
|
|
|
4aca6e |
|
|
|
4aca6e |
$bridge vlan del vid 14 dev dummy0
|
|
|
4aca6e |
|
|
|
4aca6e |
$bridge vlan show
|
|
|
4aca6e |
port vlan ids
|
|
|
4aca6e |
br0 1 PVID Egress Untagged
|
|
|
4aca6e |
|
|
|
4aca6e |
dummy0 1 PVID Egress Untagged
|
|
|
4aca6e |
10
|
|
|
4aca6e |
11
|
|
|
4aca6e |
12
|
|
|
4aca6e |
13
|
|
|
4aca6e |
15
|
|
|
4aca6e |
|
|
|
4aca6e |
$bridge vlan del vid 10-15 dev dummy0
|
|
|
4aca6e |
|
|
|
4aca6e |
$bridge vlan show
|
|
|
4aca6e |
port vlan ids
|
|
|
4aca6e |
br0 1 PVID Egress Untagged
|
|
|
4aca6e |
|
|
|
4aca6e |
dummy0 1 PVID Egress Untagged
|
|
|
4aca6e |
|
|
|
4aca6e |
Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
|
|
|
4aca6e |
Signed-off-by: Wilson Kok <wkok@cumulusnetworks.com>
|
|
|
4aca6e |
---
|
|
|
4aca6e |
bridge/vlan.c | 44 ++++++++++++++++++++++++++++++++++++++++----
|
|
|
4aca6e |
1 file changed, 40 insertions(+), 4 deletions(-)
|
|
|
4aca6e |
|
|
|
4aca6e |
diff --git a/bridge/vlan.c b/bridge/vlan.c
|
|
|
4aca6e |
index 2ceecc9..da53b4d 100644
|
|
|
4aca6e |
--- a/bridge/vlan.c
|
|
|
4aca6e |
+++ b/bridge/vlan.c
|
|
|
4aca6e |
@@ -32,6 +32,7 @@ static int vlan_modify(int cmd, int argc, char **argv)
|
|
|
4aca6e |
} req;
|
|
|
4aca6e |
char *d = NULL;
|
|
|
4aca6e |
short vid = -1;
|
|
|
4aca6e |
+ short vid_end = -1;
|
|
|
4aca6e |
struct rtattr *afspec;
|
|
|
4aca6e |
struct bridge_vlan_info vinfo;
|
|
|
4aca6e |
unsigned short flags = 0;
|
|
|
4aca6e |
@@ -49,8 +50,18 @@ static int vlan_modify(int cmd, int argc, char **argv)
|
|
|
4aca6e |
NEXT_ARG();
|
|
|
4aca6e |
d = *argv;
|
|
|
4aca6e |
} else if (strcmp(*argv, "vid") == 0) {
|
|
|
4aca6e |
+ char *p;
|
|
|
4aca6e |
NEXT_ARG();
|
|
|
4aca6e |
- vid = atoi(*argv);
|
|
|
4aca6e |
+ p = strchr(*argv, '-');
|
|
|
4aca6e |
+ if (p) {
|
|
|
4aca6e |
+ *p = '\0';
|
|
|
4aca6e |
+ p++;
|
|
|
4aca6e |
+ vid = atoi(*argv);
|
|
|
4aca6e |
+ vid_end = atoi(p);
|
|
|
4aca6e |
+ vinfo.flags |= BRIDGE_VLAN_INFO_RANGE_BEGIN;
|
|
|
4aca6e |
+ } else {
|
|
|
4aca6e |
+ vid = atoi(*argv);
|
|
|
4aca6e |
+ }
|
|
|
4aca6e |
} else if (strcmp(*argv, "self") == 0) {
|
|
|
4aca6e |
flags |= BRIDGE_FLAGS_SELF;
|
|
|
4aca6e |
} else if (strcmp(*argv, "master") == 0) {
|
|
|
4aca6e |
@@ -83,15 +94,40 @@ static int vlan_modify(int cmd, int argc, char **argv)
|
|
|
4aca6e |
return -1;
|
|
|
4aca6e |
}
|
|
|
4aca6e |
|
|
|
4aca6e |
- vinfo.vid = vid;
|
|
|
4aca6e |
+ if (vinfo.flags & BRIDGE_VLAN_INFO_RANGE_BEGIN) {
|
|
|
4aca6e |
+ if (vid_end == -1 || vid_end >= 4096 || vid >= vid_end) {
|
|
|
4aca6e |
+ fprintf(stderr, "Invalid VLAN range \"%hu-%hu\"\n",
|
|
|
4aca6e |
+ vid, vid_end);
|
|
|
4aca6e |
+ return -1;
|
|
|
4aca6e |
+ }
|
|
|
4aca6e |
+ if (vinfo.flags & BRIDGE_VLAN_INFO_PVID) {
|
|
|
4aca6e |
+ fprintf(stderr,
|
|
|
4aca6e |
+ "pvid cannot be configured for a vlan range\n");
|
|
|
4aca6e |
+ return -1;
|
|
|
4aca6e |
+ }
|
|
|
4aca6e |
+ }
|
|
|
4aca6e |
|
|
|
4aca6e |
afspec = addattr_nest(&req.n, sizeof(req), IFLA_AF_SPEC);
|
|
|
4aca6e |
|
|
|
4aca6e |
if (flags)
|
|
|
4aca6e |
addattr16(&req.n, sizeof(req), IFLA_BRIDGE_FLAGS, flags);
|
|
|
4aca6e |
|
|
|
4aca6e |
- addattr_l(&req.n, sizeof(req), IFLA_BRIDGE_VLAN_INFO, &vinfo,
|
|
|
4aca6e |
- sizeof(vinfo));
|
|
|
4aca6e |
+ vinfo.vid = vid;
|
|
|
4aca6e |
+ if (vid_end != -1) {
|
|
|
4aca6e |
+ /* send vlan range start */
|
|
|
4aca6e |
+ addattr_l(&req.n, sizeof(req), IFLA_BRIDGE_VLAN_INFO, &vinfo,
|
|
|
4aca6e |
+ sizeof(vinfo));
|
|
|
4aca6e |
+ vinfo.flags &= ~BRIDGE_VLAN_INFO_RANGE_BEGIN;
|
|
|
4aca6e |
+
|
|
|
4aca6e |
+ /* Now send the vlan range end */
|
|
|
4aca6e |
+ vinfo.flags |= BRIDGE_VLAN_INFO_RANGE_END;
|
|
|
4aca6e |
+ vinfo.vid = vid_end;
|
|
|
4aca6e |
+ addattr_l(&req.n, sizeof(req), IFLA_BRIDGE_VLAN_INFO, &vinfo,
|
|
|
4aca6e |
+ sizeof(vinfo));
|
|
|
4aca6e |
+ } else {
|
|
|
4aca6e |
+ addattr_l(&req.n, sizeof(req), IFLA_BRIDGE_VLAN_INFO, &vinfo,
|
|
|
4aca6e |
+ sizeof(vinfo));
|
|
|
4aca6e |
+ }
|
|
|
4aca6e |
|
|
|
4aca6e |
addattr_nest_end(&req.n, afspec);
|
|
|
4aca6e |
|
|
|
4aca6e |
--
|
|
|
4aca6e |
1.8.3.1
|
|
|
4aca6e |
|