|
 |
4aca6e |
From 80c5549318cec082da0793526e8e471e946103be Mon Sep 17 00:00:00 2001
|
|
|
4aca6e |
From: Phil Sutter <psutter@redhat.com>
|
|
|
4aca6e |
Date: Tue, 21 Feb 2017 22:25:04 +0100
|
|
|
4aca6e |
Subject: [PATCH] iplink: bridge_slave: add support for
|
|
|
4aca6e |
IFLA_BRPORT_MULTICAST_ROUTER
|
|
|
4aca6e |
|
|
|
4aca6e |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1374360
|
|
|
4aca6e |
Upstream Status: iproute2.git commit 10759a90ab589
|
|
|
4aca6e |
Conflicts: Context changes due to missing commits:
|
|
|
4aca6e |
* f6e615dec9ee9 ("iplink: bridge_slave: add support for
|
|
|
4aca6e |
IFLA_BRPORT_PROXYARP")
|
|
|
4aca6e |
* 38b31a78da859 ("iplink: bridge_slave: add support for
|
|
|
4aca6e |
IFLA_BRPORT_PROXYARP_WIFI")
|
|
|
4aca6e |
|
|
|
4aca6e |
commit 10759a90ab5896b5b0ca8ddd7b91c5b3a7466062
|
|
|
4aca6e |
Author: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
|
|
|
4aca6e |
Date: Tue Feb 16 16:08:54 2016 +0100
|
|
|
4aca6e |
|
|
|
4aca6e |
iplink: bridge_slave: add support for IFLA_BRPORT_MULTICAST_ROUTER
|
|
|
4aca6e |
|
|
|
4aca6e |
Add support to be able to view and change IFLA_BRPORT_MULTICAST_ROUTER port
|
|
|
4aca6e |
attribute.
|
|
|
4aca6e |
|
|
|
4aca6e |
Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
|
|
|
4aca6e |
---
|
|
|
4aca6e |
ip/iplink_bridge_slave.c | 13 +++++++++++++
|
|
|
4aca6e |
1 file changed, 13 insertions(+)
|
|
|
4aca6e |
|
|
|
4aca6e |
diff --git a/ip/iplink_bridge_slave.c b/ip/iplink_bridge_slave.c
|
|
|
4aca6e |
index 4593872..9ed44b1 100644
|
|
|
4aca6e |
--- a/ip/iplink_bridge_slave.c
|
|
|
4aca6e |
+++ b/ip/iplink_bridge_slave.c
|
|
|
4aca6e |
@@ -29,6 +29,7 @@ static void print_explain(FILE *f)
|
|
|
4aca6e |
" [ root_block {on | off} ]\n"
|
|
|
4aca6e |
" [ learning {on | off} ]\n"
|
|
|
4aca6e |
" [ flood {on | off} ]\n"
|
|
|
4aca6e |
+ " [ mcast_router MULTICAST_ROUTER ]\n"
|
|
|
4aca6e |
);
|
|
|
4aca6e |
}
|
|
|
4aca6e |
|
|
|
4aca6e |
@@ -98,6 +99,10 @@ static void bridge_slave_print_opt(struct link_util *lu, FILE *f,
|
|
|
4aca6e |
if (tb[IFLA_BRPORT_UNICAST_FLOOD])
|
|
|
4aca6e |
print_onoff(f, "flood",
|
|
|
4aca6e |
rta_getattr_u8(tb[IFLA_BRPORT_UNICAST_FLOOD]));
|
|
|
4aca6e |
+
|
|
|
4aca6e |
+ if (tb[IFLA_BRPORT_MULTICAST_ROUTER])
|
|
|
4aca6e |
+ fprintf(f, "mcast_router %u ",
|
|
|
4aca6e |
+ rta_getattr_u8(tb[IFLA_BRPORT_MULTICAST_ROUTER]));
|
|
|
4aca6e |
}
|
|
|
4aca6e |
|
|
|
4aca6e |
static void bridge_slave_parse_on_off(char *arg_name, char *arg_val,
|
|
|
4aca6e |
@@ -162,6 +167,14 @@ static int bridge_slave_parse_opt(struct link_util *lu, int argc, char **argv,
|
|
|
4aca6e |
NEXT_ARG();
|
|
|
4aca6e |
bridge_slave_parse_on_off("flood", *argv, n,
|
|
|
4aca6e |
IFLA_BRPORT_UNICAST_FLOOD);
|
|
|
4aca6e |
+ } else if (matches(*argv, "mcast_router") == 0) {
|
|
|
4aca6e |
+ __u8 mcast_router;
|
|
|
4aca6e |
+
|
|
|
4aca6e |
+ NEXT_ARG();
|
|
|
4aca6e |
+ if (get_u8(&mcast_router, *argv, 0))
|
|
|
4aca6e |
+ invarg("invalid mcast_router", *argv);
|
|
|
4aca6e |
+ addattr8(n, 1024, IFLA_BRPORT_MULTICAST_ROUTER,
|
|
|
4aca6e |
+ mcast_router);
|
|
|
4aca6e |
} else if (matches(*argv, "help") == 0) {
|
|
|
4aca6e |
explain();
|
|
|
4aca6e |
return -1;
|
|
|
4aca6e |
--
|
|
|
4aca6e |
1.8.3.1
|
|
|
4aca6e |
|