diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-04 18:31:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-04 18:31:02 -0400 |
| commit | 3cfc2c42c1cbc8e238bb9c0612c0df4565e3a8b4 (patch) | |
| tree | 5adc1ff2eaf64d450bf28bb6b2ce890db2567288 /Documentation/networking/packet_mmap.txt | |
| parent | 5cf65713f87775c548e3eb48dbafa32e12f28000 (diff) | |
| parent | 0ea6e61122196509af82cc4f36cbdaacbefb8227 (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (48 commits)
Documentation: update broken web addresses.
fix comment typo "choosed" -> "chosen"
hostap:hostap_hw.c Fix typo in comment
Fix spelling contorller -> controller in comments
Kconfig.debug: FAIL_IO_TIMEOUT: typo Faul -> Fault
fs/Kconfig: Fix typo Userpace -> Userspace
Removing dead MACH_U300_BS26
drivers/infiniband: Remove unnecessary casts of private_data
fs/ocfs2: Remove unnecessary casts of private_data
libfc: use ARRAY_SIZE
scsi: bfa: use ARRAY_SIZE
drm: i915: use ARRAY_SIZE
drm: drm_edid: use ARRAY_SIZE
synclink: use ARRAY_SIZE
block: cciss: use ARRAY_SIZE
comment typo fixes: charater => character
fix comment typos concerning "challenge"
arm: plat-spear: fix typo in kerneldoc
reiserfs: typo comment fix
update email address
...
Diffstat (limited to 'Documentation/networking/packet_mmap.txt')
| -rw-r--r-- | Documentation/networking/packet_mmap.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/networking/packet_mmap.txt b/Documentation/networking/packet_mmap.txt index 2546aa4dc232..073894d1c093 100644 --- a/Documentation/networking/packet_mmap.txt +++ b/Documentation/networking/packet_mmap.txt | |||
| @@ -8,7 +8,7 @@ capture network traffic with utilities like tcpdump or any other that needs | |||
| 8 | raw access to network interface. | 8 | raw access to network interface. |
| 9 | 9 | ||
| 10 | You can find the latest version of this document at: | 10 | You can find the latest version of this document at: |
| 11 | http://pusa.uv.es/~ulisses/packet_mmap/ | 11 | http://wiki.ipxwarzone.com/index.php5?title=Linux_packet_mmap |
| 12 | 12 | ||
| 13 | Howto can be found at: | 13 | Howto can be found at: |
| 14 | http://wiki.gnu-log.net (packet_mmap) | 14 | http://wiki.gnu-log.net (packet_mmap) |
| @@ -56,7 +56,7 @@ support for PACKET_MMAP, and also probably the libpcap included in your distribu | |||
| 56 | 56 | ||
| 57 | I'm aware of two implementations of PACKET_MMAP in libpcap: | 57 | I'm aware of two implementations of PACKET_MMAP in libpcap: |
| 58 | 58 | ||
| 59 | http://pusa.uv.es/~ulisses/packet_mmap/ (by Simon Patarin, based on libpcap 0.6.2) | 59 | http://wiki.ipxwarzone.com/ (by Simon Patarin, based on libpcap 0.6.2) |
| 60 | http://public.lanl.gov/cpw/ (by Phil Wood, based on lastest libpcap) | 60 | http://public.lanl.gov/cpw/ (by Phil Wood, based on lastest libpcap) |
| 61 | 61 | ||
| 62 | The rest of this document is intended for people who want to understand | 62 | The rest of this document is intended for people who want to understand |