[<prev] [next>] [day] [month] [year] [list]
Message-Id: <1424938013-8513-1-git-send-email-roopa@cumulusnetworks.com>
Date: Thu, 26 Feb 2015 00:06:53 -0800
From: roopa@...ulusnetworks.com
To: netdev@...r.kernel.org, stephen@...workplumber.org,
vyasevic@...hat.com
Cc: davem@...emloft.net, sfeldma@...il.com
Subject: [PATCH iproute2] bridge link: add command option 'master'
From: Roopa Prabhu <roopa@...ulusnetworks.com>
This patch adds support to specify 'master' keyword,
to target a bridge link command explicitly to the software
bridge driver.
also, adds self/master keywords to usage and man page
Signed-off-by: Roopa Prabhu <roopa@...ulusnetworks.com>
---
bridge/link.c | 5 ++++-
man/man8/bridge.8 | 12 +++++++++++-
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/bridge/link.c b/bridge/link.c
index c8555f8..8a76e11 100644
--- a/bridge/link.c
+++ b/bridge/link.c
@@ -227,6 +227,7 @@ static void usage(void)
fprintf(stderr, " [ learning_sync {on | off} ]\n");
fprintf(stderr, " [ flood {on | off} ]\n");
fprintf(stderr, " [ hwmode {vepa | veb} ]\n");
+ fprintf(stderr, " [ self | master ]\n");
fprintf(stderr, " bridge link show [dev DEV]\n");
exit(-1);
}
@@ -331,7 +332,9 @@ static int brlink_modify(int argc, char **argv)
exit(-1);
}
} else if (strcmp(*argv, "self") == 0) {
- flags = BRIDGE_FLAGS_SELF;
+ flags |= BRIDGE_FLAGS_SELF;
+ } else if (strcmp(*argv, "master") == 0) {
+ flags |= BRIDGE_FLAGS_MASTER;
} else {
usage();
}
diff --git a/man/man8/bridge.8 b/man/man8/bridge.8
index e344db2..19d925f 100644
--- a/man/man8/bridge.8
+++ b/man/man8/bridge.8
@@ -40,7 +40,8 @@ bridge \- show / manipulate bridge addresses and devices
.BR learning " { " on " | " off " } ] [ "
.BR learning_sync " { " on " | " off " } ] [ "
.BR flood " { " on " | " off " } ] [ "
-.BR hwmode " { " vepa " | " veb " } ] "
+.BR hwmode " { " vepa " | " veb " } ] [ "
+.BR self " ] [ " master " ] "
.ti -8
.BR "bridge link" " [ " show " ] [ "
@@ -284,6 +285,15 @@ switch.
.B veb
- bridging happens in hardware.
+.TP
+.BI self
+link setting is configured on specified physical device
+
+.TP
+.BI master
+link setting is configured on the software bridge (default)
+
+
.SS bridge link show - list bridge port configuration.
This command displays the current bridge port configuration and flags.
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists