aboutsummaryrefslogtreecommitdiff
path: root/Documentation/networking
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/networking')
-rw-r--r--Documentation/networking/3c509.txt2
-rw-r--r--Documentation/networking/cxgb.txt2
-rw-r--r--Documentation/networking/dl2k.txt2
-rw-r--r--Documentation/networking/dmfe.txt2
-rw-r--r--Documentation/networking/operstates.txt2
-rw-r--r--Documentation/networking/packet_mmap.txt2
-rw-r--r--Documentation/networking/pktgen.txt4
7 files changed, 8 insertions, 8 deletions
diff --git a/Documentation/networking/3c509.txt b/Documentation/networking/3c509.txt
index 867a99f88c6..0643e3b7168 100644
--- a/Documentation/networking/3c509.txt
+++ b/Documentation/networking/3c509.txt
@@ -126,7 +126,7 @@ packets faster than they can be removed from the card. This should be rare
or impossible in normal operation. Possible causes of this error report are:
- a "green" mode enabled that slows the processor down when there is no
- keyboard activitiy.
+ keyboard activity.
- some other device or device driver hogging the bus or disabling interrupts.
Check /proc/interrupts for excessive interrupt counts. The timer tick
diff --git a/Documentation/networking/cxgb.txt b/Documentation/networking/cxgb.txt
index 76324638626..7b231752f25 100644
--- a/Documentation/networking/cxgb.txt
+++ b/Documentation/networking/cxgb.txt
@@ -56,7 +56,7 @@ FEATURES
ethtool -C eth0 rx-usecs 100
- You may also provide a timer latency value while disabling adpative-rx:
+ You may also provide a timer latency value while disabling adaptive-rx:
ethtool -C <interface> adaptive-rx off rx-usecs <microseconds>
diff --git a/Documentation/networking/dl2k.txt b/Documentation/networking/dl2k.txt
index d460492037e..a3a3c6e08ce 100644
--- a/Documentation/networking/dl2k.txt
+++ b/Documentation/networking/dl2k.txt
@@ -173,7 +173,7 @@ Installing the Driver
Parameter Description
=====================
-You can install this driver without any addtional parameter. However, if you
+You can install this driver without any additional parameter. However, if you
are going to have extensive functions then it is necessary to set extra
parameter. Below is a list of the command line parameters supported by the
Linux device
diff --git a/Documentation/networking/dmfe.txt b/Documentation/networking/dmfe.txt
index 046363552d0..b1b7499dd9d 100644
--- a/Documentation/networking/dmfe.txt
+++ b/Documentation/networking/dmfe.txt
@@ -34,7 +34,7 @@ Next you should configure your network interface with a command similar to :
ifconfig eth0 172.22.3.18
^^^^^^^^^^^
- Your IP Adress
+ Your IP Address
Then you may have to modify the default routing table with command :
diff --git a/Documentation/networking/operstates.txt b/Documentation/networking/operstates.txt
index 4a21d9bb836..c9074f9b78b 100644
--- a/Documentation/networking/operstates.txt
+++ b/Documentation/networking/operstates.txt
@@ -2,7 +2,7 @@
1. Introduction
Linux distinguishes between administrative and operational state of an
-interface. Admininstrative state is the result of "ip link set dev
+interface. Administrative state is the result of "ip link set dev
<dev> up or down" and reflects whether the administrator wants to use
the device for traffic.
diff --git a/Documentation/networking/packet_mmap.txt b/Documentation/networking/packet_mmap.txt
index aaf99d5f0da..781626261e3 100644
--- a/Documentation/networking/packet_mmap.txt
+++ b/Documentation/networking/packet_mmap.txt
@@ -296,7 +296,7 @@ the following (from include/linux/if_packet.h):
- struct tpacket_hdr
- pad to TPACKET_ALIGNMENT=16
- struct sockaddr_ll
- - Gap, chosen so that packet data (Start+tp_net) alignes to
+ - Gap, chosen so that packet data (Start+tp_net) aligns to
TPACKET_ALIGNMENT=16
- Start+tp_mac: [ Optional MAC header ]
- Start+tp_net: Packet data, aligned to TPACKET_ALIGNMENT=16.
diff --git a/Documentation/networking/pktgen.txt b/Documentation/networking/pktgen.txt
index 18d385c068f..c2f859f7f2f 100644
--- a/Documentation/networking/pktgen.txt
+++ b/Documentation/networking/pktgen.txt
@@ -7,7 +7,7 @@ Date: 041221
Enable CONFIG_NET_PKTGEN to compile and build pktgen.o either in kernel
or as module. Module is preferred. insmod pktgen if needed. Once running
-pktgen creates a thread on each CPU where each thread has affinty it's CPU.
+pktgen creates a thread on each CPU where each thread has affinity to its CPU.
Monitoring and controlling is done via /proc. Easiest to select a suitable
a sample script and configure.
@@ -32,7 +32,7 @@ Running:
Stopped: eth1
Result: OK: max_before_softirq=10000
-Most important the devices assigend to thread. Note! A device can only belong
+Most important the devices assigned to thread. Note! A device can only belong
to one thread.