diff options
author | Dmitry Torokhov <dtor@insightbb.com> | 2006-12-08 01:07:56 -0500 |
---|---|---|
committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-12-08 01:07:56 -0500 |
commit | bef986502fa398b1785a3979b1aa17cd902d3527 (patch) | |
tree | b59c1afe7b1dfcc001b86e54863f550d7ddc8c34 /Documentation/networking/pktgen.txt | |
parent | 4bdbd2807deeccc0793d57fb5120d7a53f2c0b3c (diff) | |
parent | c99767974ebd2a719d849fdeaaa1674456f5283f (diff) |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/usb/input/hid.h
Diffstat (limited to 'Documentation/networking/pktgen.txt')
-rw-r--r-- | Documentation/networking/pktgen.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/networking/pktgen.txt b/Documentation/networking/pktgen.txt index c8eee23be8c0..c6cf4a3c16e0 100644 --- a/Documentation/networking/pktgen.txt +++ b/Documentation/networking/pktgen.txt | |||
@@ -63,8 +63,8 @@ Current: | |||
63 | Result: OK: 13101142(c12220741+d880401) usec, 10000000 (60byte,0frags) | 63 | Result: OK: 13101142(c12220741+d880401) usec, 10000000 (60byte,0frags) |
64 | 763292pps 390Mb/sec (390805504bps) errors: 39664 | 64 | 763292pps 390Mb/sec (390805504bps) errors: 39664 |
65 | 65 | ||
66 | Confguring threads and devices | 66 | Configuring threads and devices |
67 | ============================== | 67 | ================================ |
68 | This is done via the /proc interface easiest done via pgset in the scripts | 68 | This is done via the /proc interface easiest done via pgset in the scripts |
69 | 69 | ||
70 | Examples: | 70 | Examples: |
@@ -116,7 +116,7 @@ Examples: | |||
116 | there must be no spaces between the | 116 | there must be no spaces between the |
117 | arguments. Leading zeros are required. | 117 | arguments. Leading zeros are required. |
118 | Do not set the bottom of stack bit, | 118 | Do not set the bottom of stack bit, |
119 | thats done automatically. If you do | 119 | that's done automatically. If you do |
120 | set the bottom of stack bit, that | 120 | set the bottom of stack bit, that |
121 | indicates that you want to randomly | 121 | indicates that you want to randomly |
122 | generate that address and the flag | 122 | generate that address and the flag |