matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into net-next

This commit is contained in:
Stephen Hemminger 2015-07-31 18:12:57 -07:00
parent 6aac861713 531d5da413
commit 68831d6b45
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bridge/fdb.c
View File

@ -31,8 +31,9 @@ static unsigned int filter_index;
static void usage(void) static void usage(void)
{ {
fprintf(stderr, "Usage: bridge fdb { add | append | del | replace } ADDR dev DEV {self|master} [ temp ]\n" fprintf(stderr, "Usage: bridge fdb { add | append | del | replace ADDR dev DEV\n"
" [router] [ dst IPADDR] [ vlan VID ]\n" " [ self ] [ master ] [ use ] [ router ]\n"
" [ local | temp ] [ dst IPADDR ] [ vlan VID ]\n"
" [ port PORT] [ vni VNI ] [via DEV]\n"); " [ port PORT] [ vni VNI ] [via DEV]\n");
fprintf(stderr, " bridge fdb {show} [ br BRDEV ] [ brport DEV ]\n"); fprintf(stderr, " bridge fdb {show} [ br BRDEV ] [ brport DEV ]\n");
exit(-1); exit(-1);
@ -305,6 +306,8 @@ static int fdb_modify(int cmd, int flags, int argc, char **argv)
duparg2("vlan", *argv); duparg2("vlan", *argv);
NEXT_ARG(); NEXT_ARG();
vid = atoi(*argv); vid = atoi(*argv);
} else if (matches(*argv, "use") == 0) {
req.ndm.ndm_flags |= NTF_USE;
} else { } else {
if (strcmp(*argv, "to") == 0) { if (strcmp(*argv, "to") == 0) {
NEXT_ARG(); NEXT_ARG();

3
ip/ip.c
View File

@ -118,6 +118,7 @@ static int batch(const char *name)
char *line = NULL; char *line = NULL;
size_t len = 0; size_t len = 0;
int ret = EXIT_SUCCESS; int ret = EXIT_SUCCESS;
int orig_family = preferred_family;
batch_mode = 1; batch_mode = 1;
@ -140,6 +141,8 @@ static int batch(const char *name)
char *largv[100]; char *largv[100];
int largc; int largc;
preferred_family = orig_family;
largc = makeargs(line, largv, 100); largc = makeargs(line, largv, 100);
if (largc == 0) if (largc == 0)
continue; /* blank line */ continue; /* blank line */

18
man/man8/bridge.8
View File

@ -53,8 +53,8 @@ bridge \- show / manipulate bridge addresses and devices
.I LLADDR .I LLADDR
.B dev .B dev
.IR DEV " { " .IR DEV " { "
.BR local " | " temp " } { " .BR local " | " temp " } [ "
.BR self " } { " router " } [ " .BR self " ] [ " master " ] [ " router " ] [ " use " ] [ "
.B dst .B dst
.IR IPADDR " ] [ " .IR IPADDR " ] [ "
.B vni .B vni
@ -325,7 +325,11 @@ the Ethernet MAC address.
the interface to which this address is associated. the interface to which this address is associated.
.B self .B self
- the address is associated with a software fdb (default) - the address is associated with the port drivers fdb. Usually hardware.
.sp
.B master
- the address is associated with master devices fdb. Usually software (default).
.sp .sp
.B router .B router
@ -334,6 +338,11 @@ Valid if the referenced device is a VXLAN type device and has
route shortcircuit enabled. route shortcircuit enabled.
.sp .sp
.B use
- the address is in use. User space can use this option to
indicate to the kernel that the fdb entry is in use.
.sp
.in -8 .in -8
The next command line parameters apply only The next command line parameters apply only
when the specified device when the specified device
@ -541,8 +550,7 @@ described in previous sections.
.P .P
If a file name is given, it does not listen on RTNETLINK, If a file name is given, it does not listen on RTNETLINK,
but opens the file containing RTNETLINK messages saved in binary format but opens the file containing RTNETLINK messages saved in binary format
and dumps them. Such a history file can be generated with the and dumps them.
.SH NOTES .SH NOTES
This command uses facilities added in Linux 3.0. This command uses facilities added in Linux 3.0.