From: Stephen Hemminger <shemminger@vyatta.com>
Date: Mon, 17 Sep 2012 22:50:27 +0000 (-0700)
Subject: Add support for AF_BRIDGE
X-Git-Tag: v3.6.0~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=27bca615317b3fd3245b731dbfe0d814c7879c3f;p=thirdparty%2Fiproute2.git

Add support for AF_BRIDGE

This can be useful when displaying neighbour table
---

diff --git a/ip/ip.c b/ip/ip.c
index 4e8ac5cd4..df06d3e30 100644
--- a/ip/ip.c
+++ b/ip/ip.c
@@ -47,7 +47,7 @@ static void usage(void)
 "                   tunnel | tuntap | maddr | mroute | mrule | monitor | xfrm |\n"
 "                   netns | l2tp }\n"
 "       OPTIONS := { -V[ersion] | -s[tatistics] | -d[etails] | -r[esolve] |\n"
-"                    -f[amily] { inet | inet6 | ipx | dnet | link } |\n"
+"                    -f[amily] { inet | inet6 | ipx | dnet | bridge | link } |\n"
 "                    -l[oops] { maximum-addr-flush-attempts } |\n"
 "                    -o[neline] | -t[imestamp] | -b[atch] [filename] |\n"
 "                    -rc[vbuf] [size]}\n");
@@ -185,6 +185,8 @@ int main(int argc, char **argv)
 				preferred_family = AF_PACKET;
 			else if (strcmp(argv[1], "ipx") == 0)
 				preferred_family = AF_IPX;
+			else if (strcmp(argv[1], "bridge") == 0)
+				preferred_family = AF_BRIDGE;
 			else if (strcmp(argv[1], "help") == 0)
 				usage();
 			else
@@ -199,6 +201,8 @@ int main(int argc, char **argv)
 			preferred_family = AF_IPX;
 		} else if (strcmp(opt, "-D") == 0) {
 			preferred_family = AF_DECnet;
+		} else if (strcmp(opt, "-B") == 0) {
+			preferred_family = AF_BRIDGE;
 		} else if (matches(opt, "-stats") == 0 ||
 			   matches(opt, "-statistics") == 0) {
 			++show_stats;
diff --git a/man/man8/ip.8 b/man/man8/ip.8
index ac78c295b..4db8a6774 100644
--- a/man/man8/ip.8
+++ b/man/man8/ip.8
@@ -50,7 +50,7 @@ Zero (0) means loop until all addresses are removed.
 .TP
 .BR "\-f" , " \-family"
 followed by protocol family identifier:
-.BR "inet" , " inet6"
+.BR "inet" , " inet6" , "bridge" , "ipx" , "dnet"
 or
 .BR link ,
 enforce the protocol family to use.  If the option is not present,
@@ -76,6 +76,11 @@ shortcut for
 shortcut for
 .BR "\-family inet6" .
 
+.TP
+.B \-B
+shortcut for
+.BR "\-family bridge" .
+
 .TP
 .B \-0
 shortcut for