Merge branch 'master' of github.com:vyos/vyos-documentation into localazy-3

3 files changed, 44 insertions, 2 deletions

diff --git a/docs/_include/interface-ipv6.txt b/docs/_include/interface-ipv6.txt
index eb60b4e8..0c222d80 100644
--- a/docs/_include/interface-ipv6.txt
+++ b/docs/_include/interface-ipv6.txt
@@ -67,6 +67,34 @@
 
   .. hint:: MSS value = MTU - 40 (IPv6 header) - 20 (TCP header), resulting in
     1432 bytes on a 1492 byte MTU.
-  
-  Instead of a numerical MSS value `clamp-mss-to-pmtu` can be used to 
+
+  Instead of a numerical MSS value `clamp-mss-to-pmtu` can be used to
   automatically set the proper value.
+
+.. cfgcmd:: set interfaces {{ var0 }} <interface> {{ var2 }} {{ var3 }}
+  {{ var5 }} {{ var6 }} ipv6 accept-dad <1-3>
+
+  Whether to accept DAD (Duplicate Address Detection).
+
+  - 0: Disable DAD
+  - 1: Enable DAD (default)
+  - 2: Enable DAD, and disable IPv6 operation if MAC-based duplicate link-local address has been found.
+
+  Example:
+
+  .. code-block:: none
+
+    set interfaces {{ var0 }} {{ var1 }} {{ var2 }} {{ var4 }} {{ var5 }} {{ var7 }} ipv6 accept-dad 2
+
+.. cfgcmd:: set interfaces {{ var0 }} <interface> {{ var2 }} {{ var3 }}
+  {{ var5 }} {{ var6 }} ipv6 dup-addr-detect-transmits <n>
+
+  The amount of Duplicate Address Detection probes to send.
+
+  Default: 1
+
+  Example:
+
+  .. code-block:: none
+
+    set interfaces {{ var0 }} {{ var1 }} {{ var2 }} {{ var4 }} {{ var5 }} {{ var7 }} ipv6 dup-addr-detect-transmits 5
diff --git a/docs/_include/interface-per-client-thread.txt b/docs/_include/interface-per-client-thread.txt
new file mode 100644
index 00000000..877be591
--- /dev/null
+++ b/docs/_include/interface-per-client-thread.txt
@@ -0,0 +1,14 @@
+.. cfgcmd:: set interfaces {{ var0 }} <interface> {{ var2 }} {{ var3 }}
+  {{ var5 }} {{ var6 }} per-client-thread
+
+  Provides a per-device control to enable/disable the threaded mode for
+  all the NAPI instances of the given network device, without the need for
+  a device up/down.
+
+  If CLI option is not specified, this feature is disabled.
+
+  Example:
+
+  .. code-block:: none
+
+    set interfaces {{ var0 }} {{ var1 }} {{ var2 }} {{ var4 }} {{ var5 }} {{ var7 }} per-client-thread
diff --git a/docs/_include/vyos-1x b/docs/_include/vyos-1x
-Subproject 1a44d8607f715934f2c03f28a9bf547321b26ed
+Subproject ffb798b4678f3b1bd0a40cc42b1f0477470346d