dpdk: Remove obsolet options, update DPDK version

'txqflags=0xf00' & 'disable-hw-vlan' options have been
removed in DPDK 18.02
Reference: LXCR-8388

DPDK has been updated to 18.02, updated references.
Reference: LXCR-8409

Since we build DPDK with static library, -d option should be removed:
testpmd -c 0x3 -n 2 -d librte_pmd_virtio.so.1.1  <<<< remove -d
Reference: LXCR-88220

Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>

2 files changed, 30 insertions, 30 deletions

diff --git a/doc/book-enea-nfv-access-guide-intel/doc/benchmarks.xml b/doc/book-enea-nfv-access-guide-intel/doc/benchmarks.xml
index 3279601..38dc327 100644
--- a/doc/book-enea-nfv-access-guide-intel/doc/benchmarks.xml
+++ b/doc/book-enea-nfv-access-guide-intel/doc/benchmarks.xml
@@ -346,9 +346,9 @@ ovs-ofctl add-flow ovsbr0 in_port=2,action=output:1</programlisting>Import a
 -v /mnt/huge:/mnt/huge el7_guest /bin/bash</programlisting>Start the testpmd
           application in Docker:<programlisting>testpmd -c 0x30 -n 2 --file-prefix prog1  --socket-mem 512 --no-pci /
 --vdev=virtio_user0,path=/var/run/openvswitch/vhost-user1 /
--d /usr/lib/librte_pmd_virtio.so.1.1  -- --burst 64 --disable-hw-vlan /
+/usr/lib/librte_pmd_virtio.so.1.1  -- --burst 64 /
 --disable-rss  -i --portmask=0x1 --coremask=0x20  --nb-cores=1 /
---rxq=1 --txq=1 --txd=512 --rxd=512 --txqflags=0xf00 --port-topology=chained</programlisting>To
+--rxq=1 --txq=1 --txd=512 --rxd=512 --port-topology=chained</programlisting>To
           start traffic <emphasis role="bold">forwarding</emphasis>, run the
           following command in testpmd CLI:<programlisting>start</programlisting>To
           start traffic but in <emphasis role="bold">termination</emphasis>
@@ -604,9 +604,9 @@ ovs-ofctl add-flow ovsbr0 in_port=2,action=output:1</programlisting>Import a
 -v /mnt/huge:/mnt/huge el7_guest /bin/bash</programlisting>Start the testpmd
           application in Docker1:<programlisting>testpmd -c 0x30 -n 2 --file-prefix prog1  --socket-mem 512 --no-pci /
 --vdev=virtio_user0,path=/var/run/openvswitch/vhost-user1 /
--d /usr/lib/librte_pmd_virtio.so.1.1 -- --burst 64 --disable-hw-vlan /
+/usr/lib/librte_pmd_virtio.so.1.1 -- --burst 64 /
 --disable-rss  -i --portmask=0x1 --coremask=0x20  --nb-cores=1 /
---rxq=1 --txq=1 --txd=512 --rxd=512 --txqflags=0xf00 --port-topology=chained</programlisting>Configure
+--rxq=1 --txq=1 --txd=512 --rxd=512 --port-topology=chained</programlisting>Configure
           it in termination mode:<programlisting>set fwd rxonly</programlisting>Run
           the testpmd application:<programlisting>start</programlisting>Open a
           new console to the host and start the second Docker
@@ -614,13 +614,13 @@ ovs-ofctl add-flow ovsbr0 in_port=2,action=output:1</programlisting>Import a
 -v /mnt/huge:/mnt/huge el7_guest /bin/bash</programlisting>In the second
           container start testpmd:<programlisting>testpmd -c 0x0F --file-prefix prog2 --socket-mem 512 --no-pci /
 --vdev=virtio_user0,path=/var/run/openvswitch/vhost-user2 /
--d /usr/lib/librte_pmd_virtio.so.1.1 -- -i --disable-hw-vlan</programlisting>Run
-          the TestPmd application in the second Docker:<programlisting>testpmd -c 0x3 -n 2 --file-prefix prog2  --socket-mem 512 --no-pci /
+/usr/lib/librte_pmd_virtio.so.1.1 -- -i</programlisting>Run the TestPmd
+          application in the second Docker:<programlisting>testpmd -c 0x3 -n 2 --file-prefix prog2  --socket-mem 512 --no-pci /
 --vdev=virtio_user0,path=/var/run/openvswitch/vhost-user2 /
--d /usr/lib/librte_pmd_virtio.so.1.1 -- --burst 64 --disable-hw-vlan /
+/usr/lib/librte_pmd_virtio.so.1.1 -- --burst 64 /
 --disable-rss  -i --portmask=0x1 --coremask=0x2  --nb-cores=1 --rxq=1 /
---txq=1 --txd=512 --rxd=512 --txqflags=0xf00 --port-topology=chained</programlisting>In
-          the testpmd shell, run:<programlisting>start</programlisting>Start
+--txq=1 --txd=512 --rxd=512 --port-topology=chained</programlisting>In the
+          testpmd shell, run:<programlisting>start</programlisting>Start
           pktgen traffic by running the following command in pktgen
           CLI:<programlisting>start 0</programlisting>To record traffic
           results:<programlisting>show port stats 0</programlisting>This
@@ -945,10 +945,10 @@ processor.max_cstate=0 mce=ignore_ce audit=0'</programlisting>Inside QEMU,
 mount -t hugetlbfs nodev /mnt/huge
 modprobe igb_uio
 dpdk-devbind --bind=igb_uio 0000:00:02.0</programlisting>Inside QEMU, run
-          testpmd: <programlisting>testpmd -c 0x3 -n 2 -d librte_pmd_virtio.so.1.1  /
--- --burst 64 --disable-hw-vlan --disable-rss  -i --portmask=0x1 /
+          testpmd: <programlisting>testpmd -c 0x3 -n 2 librte_pmd_virtio.so.1.1  /
+-- --burst 64 --disable-rss  -i --portmask=0x1 /
 --coremask=0x2  --nb-cores=1 --rxq=1 --txq=1 --txd=512 --rxd=512 /
---txqflags=0xf00 --port-topology=chained</programlisting>For the <emphasis
+--port-topology=chained</programlisting>For the <emphasis
           role="bold">Forwarding test</emphasis>, start testpmd
           directly:<programlisting>start</programlisting>For the <emphasis
           role="bold">Termination test</emphasis>, set testpmd to only
@@ -1243,20 +1243,20 @@ processor.max_cstate=0 mce=ignore_ce audit=0'</programlisting>Configure DPDK
 mount -t hugetlbfs nodev /mnt/huge
 modprobe igb_uio
 dpdk-devbind --bind=igb_uio 0000:00:02.0</programlisting>Run testpmd inside
-          VM1:<programlisting>testpmd -c 0x3 -n 2 -d librte_pmd_virtio.so.1.1  /
--- --burst 64 --disable-hw-vlan --disable-rss  -i /
+          VM1:<programlisting>testpmd -c 0x3 -n 2 librte_pmd_virtio.so.1.1  /
+-- --burst 64 --disable-rss  -i /
 --portmask=0x1 --coremask=0x2  --nb-cores=1 --rxq=1 /
---txq=1 --txd=512 --rxd=512 --txqflags=0xf00 --port-topology=chained</programlisting>Start
+--txq=1 --txd=512 --rxd=512 --port-topology=chained</programlisting>Start
           testpmd inside VM1:<programlisting>start</programlisting>Configure
           DPDK inside VM2:<programlisting>mkdir -p /mnt/huge
 mount -t hugetlbfs nodev /mnt/huge
 modprobe igb_uio
 dpdk-devbind --bind=igb_uio 0000:00:02.0</programlisting>Run testpmd inside
-          VM2:<programlisting>testpmd -c 0x3 -n 2 -d librte_pmd_virtio.so.1.1  /
--- --burst 64 --disable-hw-vlan --disable-rss -i --portmask=0x1 /
+          VM2:<programlisting>testpmd -c 0x3 -n 2 librte_pmd_virtio.so.1.1  /
+-- --burst 64 --disable-rss -i --portmask=0x1 /
 --coremask=0x2  --nb-cores=1 --rxq=1 --txq=1 --txd=512 /
---rxd=512 --txqflags=0xf00 --port-topology=chained</programlisting>Set VM2 for
-          termination and start testpmd:<programlisting>set fwd rxonly
+--rxd=512 --port-topology=chained</programlisting>Set VM2 for termination and
+          start testpmd:<programlisting>set fwd rxonly
 start</programlisting>On target 1, start pktgen traffic:<programlisting>start 0</programlisting>Use
           this command to refresh testpmd display in VM1 and VM2 and note the
           highest values:<programlisting>show port stats 0</programlisting>To
@@ -1634,4 +1634,4 @@ start</programlisting><table>
       </section>
     </section>
   </section>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/doc/book-enea-nfv-access-guide-intel/doc/dpdk.xml b/doc/book-enea-nfv-access-guide-intel/doc/dpdk.xml
index aa85317..fce0da4 100644
--- a/doc/book-enea-nfv-access-guide-intel/doc/dpdk.xml
+++ b/doc/book-enea-nfv-access-guide-intel/doc/dpdk.xml
@@ -20,15 +20,15 @@
   <programlisting>default_hugepagesz=1GB hugepagesz=1GB hugepages=8 hugepagesz=2M hugepages=2048</programlisting>
 
   <para>For DPDK documentation, see <ulink
-  url="http://dpdk.org/doc/guides-17.08/index.html">http://dpdk.org/doc/guides-17.08/index.html</ulink></para>
+  url="http://dpdk.org/doc/guides-18.02/index.html">http://dpdk.org/doc/guides-18.02/index.html</ulink></para>
 
   <section id="pktgen">
     <title>Pktgen</title>
 
-    <para>In addition to DPDK, Enea NFV Access includes Pktgen, a
-    software traffic generator that is powered by the DPDK packet processing
-    framework. Pktgen can act as a transmitter or receiver and is capable of
-    generating 10Gbit wire rate traffic with 64 byte frames.</para>
+    <para>In addition to DPDK, Enea NFV Access includes Pktgen, a software
+    traffic generator that is powered by the DPDK packet processing framework.
+    Pktgen can act as a transmitter or receiver and is capable of generating
+    10Gbit wire rate traffic with 64 byte frames.</para>
 
     <para>Pktgen is installed in <literal>/usr/share/apps/pktgen/</literal>
     and needs to be executed from this directory.</para>
@@ -64,7 +64,7 @@ mount -t hugetlbfs nodev /mnt/huge</programlisting>
         <para><programlisting>dpdk-devbind --bind=igb_uio &lt;PCI device number&gt;</programlisting>The
         DPDK provides the dpdk-devbind tool to help binding/unbinding devices
         from specific drivers. See <ulink
-        url="http://dpdk.org/doc/guides-17.08/tools/devbind.html">http://dpdk.org/doc/guides-17.08/tools/devbind.html</ulink>
+        url="http://dpdk.org/doc/guides-18.02/tools/devbind.html">http://dpdk.org/doc/guides-18.02/tools/devbind.html</ulink>
         for more information.</para>
       </listitem>
     </orderedlist>
@@ -87,8 +87,8 @@ mount -t hugetlbfs nodev /mnt/huge</programlisting>
 
     <orderedlist>
       <listitem>
-        <para>Setup DPDK on both boards, following the instructions in
-        <xref linkend="dpdk-setup"/>.</para>
+        <para>Setup DPDK on both boards, following the instructions in <xref
+        linkend="dpdk-setup" />.</para>
       </listitem>
 
       <listitem>
@@ -112,8 +112,8 @@ mount -t hugetlbfs nodev /mnt/huge</programlisting>
 
         <para>For more information, refer to the testpmd application user
         guide: <ulink
-        url="http://dpdk.org/doc/guides-17.08/testpmd_app_ug/index.html">http://dpdk.org/doc/guides-17.08/testpmd_app_ug/index.html</ulink>.</para>
+        url="http://dpdk.org/doc/guides-18.02/testpmd_app_ug/index.html">http://dpdk.org/doc/guides-18.02/testpmd_app_ug/index.html</ulink>.</para>
       </listitem>
     </orderedlist>
   </section>
-</chapter>
\ No newline at end of file
+</chapter>