From: David Ahern <dsahern@gmail.com>
Date: Mon, 8 Jan 2018 18:10:45 +0000 (-0800)
Subject: Merge branch 'master' into net-next
X-Git-Tag: v4.16.0~89
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a21ca8a4aa44fa1826b3878f42e6b0a1b90bae0;p=thirdparty%2Fiproute2.git

Merge branch 'master' into net-next

 Conflicts:
	man/man8/ip-link.8.in

Signed-off-by: David Ahern <dsahern@gmail.com>
---

6a21ca8a4aa44fa1826b3878f42e6b0a1b90bae0
diff --cc ip/link_gre.c
index 65ad8bad4,3c0b6d678..52c581d22
--- a/ip/link_gre.c
+++ b/ip/link_gre.c
@@@ -43,12 -43,9 +43,13 @@@ static void print_usage(FILE *f
  		"                            [ [no]encap-csum ]\n"
  		"                            [ [no]encap-csum6 ]\n"
  		"                            [ [no]encap-remcsum ]\n"
+ 		"                            [ external ]\n"
  		"                            [ fwmark MARK ]\n"
 +		"                            [ erspan_ver version ]\n"
  		"                            [ erspan IDX ]\n"
 +		"                            [ erspan_dir { ingress | egress } ]\n"
 +		"                            [ erspan_hwid hwid ]\n"
 +		"                            [ external ]\n"
  		"\n"
  		"Where: ADDR := { IP_ADDRESS | any }\n"
  		"       TOS  := { NUMBER | inherit }\n"
diff --cc man/man8/ip-link.8.in
index fc6694c0c,ff6bb9a20..1d1f0363f
--- a/man/man8/ip-link.8.in
+++ b/man/man8/ip-link.8.in
@@@ -668,10 -652,33 +669,33 @@@ keyword
  
  .in -8
  
+ .TP
+ VETH, VXCAN Type Support
+ For a link of types
+ .I VETH/VXCAN
+ the following additional arguments are supported:
+ 
+ .BI "ip link add " DEVICE
+ .BR type " { " veth " | " vxcan " }"
+ [
+ .BR peer
+ .BI "name " NAME
+ ]
+ 
+ .in +8
+ .sp
+ .BR peer
+ .BI "name " NAME
+ - specifies the virtual pair device name of the
+ .I VETH/VXCAN
+ tunnel.
+ 
+ .in -8
+ 
  .TP
 -GRE, IPIP, SIT, ERSPAN Type Support
 +GRE, IPIP, SIT Type Support
  For a link of types
 -.I GRE/IPIP/SIT/ERSPAN
 +.I GRE/IPIP/SIT
  the following additional arguments are supported:
  
  .BI "ip link add " DEVICE
@@@ -689,6 -696,10 +713,8 @@@
  .I " [no]encap-remcsum "
  ] [
  .I " mode " { ip6ip | ipip | mplsip | any } "
+ ] [
 -.BR erspan " \fIIDX "
 -] [
+ .BR external
  ]
  
  .in +8
@@@ -733,6 -744,18 +759,11 @@@ MPLS-Over-IPv4, "any" indicates IPv6, I
  SIT where the default is "ip6ip" and IPIP where the default is "ipip".
  IPv6-Over-IPv4 is not supported for IPIP.
  
 -.sp
 -.BR erspan " \fIIDX "
 -- specifies the ERSPAN index field.
 -.IR IDX
 -indicates a 20 bit index/port number associated with the ERSPAN
 -traffic's source port and direction.
 -
+ .sp
+ .BR external
+ - make this tunnel externally controlled
+ .RB "(e.g. " "ip route encap" ).
+ 
  .in -8
  
  .TP