Merge branch 'upstream-fixes' into upstream

[linux-2.6] / Documentation / networking / pktgen.txt

diff --git a/Documentation/networking/pktgen.txt b/Documentation/networking/pktgen.txt
index cc4b4d04129c7ffea1c0a3d936b1f16bd2268d8a..278771c9ad99eda54420ca1d9d3c8a88e778d807 100644 (file)
--- a/Documentation/networking/pktgen.txt
+++ b/Documentation/networking/pktgen.txt
@@ -109,6 +109,22 @@ Examples:
                          cycle through the port range.
  pgset "udp_dst_max 9"   set UDP destination port max.
 
+ pgset "mpls 0001000a,0002000a,0000000a" set MPLS labels (in this example
+                                         outer label=16,middle label=32,
+                                        inner label=0 (IPv4 NULL)) Note that
+                                        there must be no spaces between the
+                                        arguments. Leading zeros are required.
+                                        Do not set the bottom of stack bit,
+                                        thats done automatically. If you do
+                                        set the bottom of stack bit, that
+                                        indicates that you want to randomly
+                                        generate that address and the flag
+                                        MPLS_RND will be turned on. You
+                                        can have any mix of random and fixed
+                                        labels in the label stack.
+
+ pgset "mpls 0"                  turn off mpls (or any invalid argument works too!)
+
  pgset stop                      aborts injection. Also, ^C aborts generator.
 
 
@@ -167,6 +183,8 @@ pkt_size
 min_pkt_size
 max_pkt_size
 
+mpls
+
 udp_src_min
 udp_src_max
 
@@ -211,4 +229,4 @@ Grant Grundler for testing on IA-64 and parisc, Harald Welte,  Lennert Buytenhek
 Stephen Hemminger, Andi Kleen, Dave Miller and many others.
 
 
-Good luck with the linux net-development.
\ No newline at end of file
+Good luck with the linux net-development.