netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Simon Horman <simon.horman@netronome.com>
To: netdev@vger.kernel.org
Cc: stephen@networkplumber.org
Subject: [PATCH/RFC iproute2 1/3] iptunnel: document mode parameter for sit tunnels
Date: Wed,  6 Jul 2016 20:23:16 +0200	[thread overview]
Message-ID: <1467829398-4601-2-git-send-email-simon.horman@netronome.com> (raw)
In-Reply-To: <1467829398-4601-1-git-send-email-simon.horman@netronome.com>

Signed-off-by: Simon Horman <simon.horman@netronome.com>
---
 man/man8/ip-link.8.in | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in
index 375b4d081408..822cf1bbd5f1 100644
--- a/man/man8/ip-link.8.in
+++ b/man/man8/ip-link.8.in
@@ -605,6 +605,8 @@ the following additional arguments are supported:
 .I " [no]encap-csum "
 ] [
 .I " [no]encap-remcsum "
+] [
+.I " mode " { ip6ip | ipip | any } "
 ]
 
 .in +8
@@ -641,6 +643,12 @@ encapsulation.
 - specifies if Remote Checksum Offload is enabled. This is only
 applicable for Generic UDP Encapsulation.
 
+.sp
+.BI mode " { ip6ip | ipip | any } "
+- specifies mode in which device should run. "ip6ip" indicates
+IPv6-Over-IPv4, "ipip" indicates "IPv4-Over-IPv4", "any" indicates either
+IPv6 or IPv4 Over IPv4. Only supported for SIT where the default is "ip6ip".
+
 .in -8
 
 .TP
-- 
2.7.0.rc3.207.g0ac5344

  reply	other threads:[~2016-07-06 18:23 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-06 18:23 [PATCH/RFC iproute2 0/3] iptunnel: support MPLS in IPv4 and UDP Simon Horman
2016-07-06 18:23 ` Simon Horman [this message]
2016-07-06 18:23 ` [PATCH/RFC iproute2 2/3] iptunnel: add support for mpls/ip to sit tunnels Simon Horman
2016-08-03  0:48   ` David Ahern
2016-07-06 18:23 ` [PATCH/RFC iproute2 3/3] iptunnel: add support for mpls/ip to ipip tunnels Simon Horman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1467829398-4601-2-git-send-email-simon.horman@netronome.com \
    --to=simon.horman@netronome.com \
    --cc=netdev@vger.kernel.org \
    --cc=stephen@networkplumber.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).