diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 15:21:04 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-08 15:21:04 -0500 |
| commit | 988addf82e4c03739375279de73929580a2d4a6a (patch) | |
| tree | 989ae1cd4e264bbad80c65f04480486246e7b9f3 /Documentation/networking/packet_mmap.txt | |
| parent | 004c1c7096659d352b83047a7593e91d8a30e3c5 (diff) | |
| parent | 25cf84cf377c0aae5dbcf937ea89bc7893db5176 (diff) | |
Merge branch 'origin' into devel-stable
Conflicts:
arch/arm/mach-mx2/devices.c
arch/arm/mach-mx2/devices.h
sound/soc/pxa/pxa-ssp.c
Diffstat (limited to 'Documentation/networking/packet_mmap.txt')
| -rw-r--r-- | Documentation/networking/packet_mmap.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/networking/packet_mmap.txt b/Documentation/networking/packet_mmap.txt index a22fd85e3796..09ab0d290326 100644 --- a/Documentation/networking/packet_mmap.txt +++ b/Documentation/networking/packet_mmap.txt | |||
| @@ -2,7 +2,7 @@ | |||
| 2 | + ABSTRACT | 2 | + ABSTRACT |
| 3 | -------------------------------------------------------------------------------- | 3 | -------------------------------------------------------------------------------- |
| 4 | 4 | ||
| 5 | This file documents the CONFIG_PACKET_MMAP option available with the PACKET | 5 | This file documents the mmap() facility available with the PACKET |
| 6 | socket interface on 2.4 and 2.6 kernels. This type of sockets is used for | 6 | socket interface on 2.4 and 2.6 kernels. This type of sockets is used for |
| 7 | capture network traffic with utilities like tcpdump or any other that needs | 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. |
| @@ -44,7 +44,7 @@ enabled. For transmission, check the MTU (Maximum Transmission Unit) used and | |||
| 44 | supported by devices of your network. | 44 | supported by devices of your network. |
| 45 | 45 | ||
| 46 | -------------------------------------------------------------------------------- | 46 | -------------------------------------------------------------------------------- |
| 47 | + How to use CONFIG_PACKET_MMAP to improve capture process | 47 | + How to use mmap() to improve capture process |
| 48 | -------------------------------------------------------------------------------- | 48 | -------------------------------------------------------------------------------- |
| 49 | 49 | ||
| 50 | From the user standpoint, you should use the higher level libpcap library, which | 50 | From the user standpoint, you should use the higher level libpcap library, which |
| @@ -64,7 +64,7 @@ the low level details or want to improve libpcap by including PACKET_MMAP | |||
| 64 | support. | 64 | support. |
| 65 | 65 | ||
| 66 | -------------------------------------------------------------------------------- | 66 | -------------------------------------------------------------------------------- |
| 67 | + How to use CONFIG_PACKET_MMAP directly to improve capture process | 67 | + How to use mmap() directly to improve capture process |
| 68 | -------------------------------------------------------------------------------- | 68 | -------------------------------------------------------------------------------- |
| 69 | 69 | ||
| 70 | From the system calls stand point, the use of PACKET_MMAP involves | 70 | From the system calls stand point, the use of PACKET_MMAP involves |
| @@ -105,7 +105,7 @@ also the mapping of the circular buffer in the user process and | |||
| 105 | the use of this buffer. | 105 | the use of this buffer. |
| 106 | 106 | ||
| 107 | -------------------------------------------------------------------------------- | 107 | -------------------------------------------------------------------------------- |
| 108 | + How to use CONFIG_PACKET_MMAP directly to improve transmission process | 108 | + How to use mmap() directly to improve transmission process |
| 109 | -------------------------------------------------------------------------------- | 109 | -------------------------------------------------------------------------------- |
| 110 | Transmission process is similar to capture as shown below. | 110 | Transmission process is similar to capture as shown below. |
| 111 | 111 | ||