1
- From dfd52e38ab402822aa4011039efa00e9d183d6a6 Mon Sep 17 00:00:00 2001
1
+ From 392735fcb41b303b6dbe3517fab9ba734ff2e288 Mon Sep 17 00:00:00 2001
2
2
From: Joachim Wiberg <troglobit@gmail.com>
3
3
Date: Tue, 5 Mar 2024 09:41:46 +0100
4
4
Subject: [PATCH 1/2] iplink_bridge: add mcast_flood_always bridge option
@@ -17,7 +17,7 @@ Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
17
17
3 files changed, 32 insertions(+)
18
18
19
19
diff --git a/include/uapi/linux/if_bridge.h b/include/uapi/linux/if_bridge.h
20
- index c206cf6d..84ef4233 100644
20
+ index c206cf6..84ef423 100644
21
21
--- a/include/uapi/linux/if_bridge.h
22
22
+++ b/include/uapi/linux/if_bridge.h
23
23
@@ -830,6 +830,7 @@ enum br_boolopt_id {
@@ -29,7 +29,7 @@ index c206cf6d..84ef4233 100644
29
29
};
30
30
31
31
diff --git a/ip/iplink_bridge.c b/ip/iplink_bridge.c
32
- index f01ffe15..2a489b7b 100644
32
+ index 1fe8955..d4f2c80 100644
33
33
--- a/ip/iplink_bridge.c
34
34
+++ b/ip/iplink_bridge.c
35
35
@@ -41,6 +41,7 @@ static void print_explain(FILE *f)
@@ -80,10 +80,10 @@ index f01ffe15..2a489b7b 100644
80
80
81
81
if (tb[IFLA_BR_MCAST_ROUTER])
82
82
diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in
83
- index eabca490..ba0a5304 100644
83
+ index efb6248..2308835 100644
84
84
--- a/man/man8/ip-link.8.in
85
85
+++ b/man/man8/ip-link.8.in
86
- @@ -1703 ,6 +1703 ,8 @@ the following additional arguments are supported:
86
+ @@ -1712 ,6 +1712 ,8 @@ the following additional arguments are supported:
87
87
] [
88
88
.BI vlan_stats_per_port " VLAN_STATS_PER_PORT "
89
89
] [
@@ -92,7 +92,7 @@ index eabca490..ba0a5304 100644
92
92
.BI mcast_snooping " MULTICAST_SNOOPING "
93
93
] [
94
94
.BI mcast_vlan_snooping " MULTICAST_VLAN_SNOOPING "
95
- @@ -1851 ,6 +1853 ,16 @@ or disable
95
+ @@ -1860 ,6 +1862 ,16 @@ or disable
96
96
.RI ( VLAN_STATS_PER_PORT " == 0) "
97
97
per-VLAN per-port stats accounting. Can be changed only when there are no port VLANs configured.
98
98
0 commit comments