diff --git a/iproute.spec b/iproute.spec index d9ff7ba..3d04026 100644 --- a/iproute.spec +++ b/iproute.spec @@ -22,6 +22,7 @@ Patch10: iproute2-3.10.0-lnstat-interval.patch Patch11: iproute2-3.10.0-rtnl_send.patch # Rejected by upstream Patch12: iproute2-3.11.0-tc-ok.patch +Patch13: iproute2-3.11.0-iproute2-bridge-document-mdb.patch License: GPLv2+ and Public Domain BuildRequires: bison BuildRequires: flex @@ -79,6 +80,7 @@ The libnetlink static library. %patch10 -p1 -b .lnstat-interval %patch11 -p1 -b .rtnl_send %patch12 -p1 -b .tc_ok +%patch13 -p1 -b .bridge_mdb_doc sed -i 's/^LIBDIR=/LIBDIR?=/' Makefile %build @@ -180,6 +182,7 @@ done %changelog * Tue Sep 24 2013 Petr Pisar - 3.10.0-7 - Add tc -OK option +- Document "bridge mdb" and "bridge monitor mdb" * Fri Aug 30 2013 Petr Šabata - 3.10.0-6 - Fix lnstat -i properly this time diff --git a/iproute2-3.11.0-iproute2-bridge-document-mdb.patch b/iproute2-3.11.0-iproute2-bridge-document-mdb.patch new file mode 100644 index 0000000..0c827f5 --- /dev/null +++ b/iproute2-3.11.0-iproute2-bridge-document-mdb.patch @@ -0,0 +1,153 @@ +From 54e9c3a34d4ba8a0890f3bf21d708342329461b5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Thu, 19 Sep 2013 10:41:26 +0200 +Subject: [PATCH] iproute2: bridge: document mdb +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This augments bridge(8) manual page with `bridge mdb' and `bridge +monitor mdb' commands which have been added recently. + +Signed-off-by: Petr Písař +--- + man/man8/bridge.8 | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 85 insertions(+), 3 deletions(-) + +diff --git a/man/man8/bridge.8 b/man/man8/bridge.8 +index 66678b5..9a34804 100644 +--- a/man/man8/bridge.8 ++++ b/man/man8/bridge.8 +@@ -13,7 +13,7 @@ bridge \- show / manipulate bridge addresses and devices + + .ti -8 + .IR OBJECT " := { " +-.BR link " | " fdb " | " vlan " | " monitor " }" ++.BR link " | " fdb " | " mdb " | " vlan " | " monitor " }" + .sp + + .ti -8 +@@ -65,6 +65,21 @@ bridge \- show / manipulate bridge addresses and devices + .IR DEV " ]" + + .ti -8 ++.BR "bridge mdb" " { " add " | " del " } " ++.B dev ++.IR DEV ++.B port ++.IR PORT ++.B grp ++.IR GROUP " [ " ++.BR permanent " | " temp " ]" ++ ++.ti -8 ++.BR "bridge mdb show " [ " ++.B dev ++.IR DEV " ]" ++ ++.ti -8 + .BR "bridge vlan" " { " add " | " del " } " + .B dev + .IR DEV +@@ -79,7 +94,7 @@ bridge \- show / manipulate bridge addresses and devices + .IR DEV " ]" + + .ti -8 +-.BR "bridge monitor" " [ " all " | " neigh " | " link " ]" ++.BR "bridge monitor" " [ " all " | " neigh " | " link " | " mdb " ]" + + .SH OPTIONS + +@@ -110,6 +125,10 @@ As a rule, the information is statistics or some time values. + - Forwarding Database entry. + + .TP ++.B mdb ++- Multicast group database entry. ++ ++.TP + .B vlan + - VLAN filter list. + +@@ -326,6 +345,69 @@ With the + option, the command becomes verbose. It prints out the last updated + and last used time for each entry. + ++.SH bridge mdb - multicast group database management ++ ++.B mdb ++objects contain known IP multicast group addresses on a link. ++ ++.P ++The corresponding commands display mdb entries, add new entries, ++and delete old ones. ++ ++.SS bridge mdb add - add a new multicast group database entry ++ ++This command creates a new mdb entry. ++ ++.TP ++.BI dev " DEV" ++the interface where this group address is associated. ++ ++.TP ++.BI port " PORT" ++the port whose link is known to have members of this multicast group. ++ ++.TP ++.BI grp " GROUP" ++the IP multicast group address whose members reside on the link connected to ++the port. ++ ++.B permanent ++- the mdb entry is permanent ++.sp ++ ++.B temp ++- the mdb entry is temporary (default) ++.sp ++ ++.in -8 ++.SS bridge mdb delete - delete a multicast group database entry ++This command removes an existing mdb entry. ++ ++.PP ++The arguments are the same as with ++.BR "bridge mdb add" . ++ ++.SS bridge mdb show - list multicast group database entries ++ ++This command displays the current multicast group membership table. The table ++is populated by IGMP and MLD snooping in the bridge driver automatically. It ++can be altered by ++.B bridge mdb add ++and ++.B bridge mdb del ++commands manually too. ++ ++.TP ++.BI dev " DEV" ++the interface only whose entries should be listed. Default is to list all ++bridge interfaces. ++ ++.PP ++With the ++.B -details ++option, the command becomes verbose. It prints out the ports known to have ++a connected router. ++ + .SH bridge vlan - VLAN filter list + + .B vlan +@@ -395,7 +477,7 @@ command is the first in the command line and then the object list follows: + .I OBJECT-LIST + is the list of object types that we want to monitor. + It may contain +-.BR link ", and " fdb "." ++.BR link ", " fdb ", and " mdb "." + If no + .B file + argument is given, +-- +1.8.3.1 +