summaryrefslogtreecommitdiff
path: root/Documentation/networking
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/networking')
-rw-r--r--Documentation/networking/bonding.txt2
-rw-r--r--Documentation/networking/cs89x0.txt2
-rw-r--r--Documentation/networking/decnet.txt2
-rw-r--r--Documentation/networking/e1000.txt2
-rw-r--r--Documentation/networking/s2io.txt2
-rw-r--r--Documentation/networking/sk98lin.txt2
6 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/networking/bonding.txt b/Documentation/networking/bonding.txt
index dc942eaf490f..de809e58092f 100644
--- a/Documentation/networking/bonding.txt
+++ b/Documentation/networking/bonding.txt
@@ -1023,7 +1023,7 @@ Changing a Bond's Configuration
files located in /sys/class/net/<bond name>/bonding
The names of these files correspond directly with the command-
-line parameters described elsewhere in in this file, and, with the
+line parameters described elsewhere in this file, and, with the
exception of arp_ip_target, they accept the same values. To see the
current setting, simply cat the appropriate file.
diff --git a/Documentation/networking/cs89x0.txt b/Documentation/networking/cs89x0.txt
index f1f9e8afe1eb..64896470e279 100644
--- a/Documentation/networking/cs89x0.txt
+++ b/Documentation/networking/cs89x0.txt
@@ -684,7 +684,7 @@ ethernet@crystal.cirrus.com) and request that you be registered for automatic
software-update notification.
Cirrus Logic maintains a web page at http://www.cirrus.com with the
-the latest drivers and technical publications.
+latest drivers and technical publications.
6.4 Current maintainer
diff --git a/Documentation/networking/decnet.txt b/Documentation/networking/decnet.txt
index e6c39c5831f5..badb7480ea62 100644
--- a/Documentation/networking/decnet.txt
+++ b/Documentation/networking/decnet.txt
@@ -82,7 +82,7 @@ ethernet address of your ethernet card has to be set according to the DECnet
address of the node in order for it to be autoconfigured (and then appear in
/proc/net/decnet_dev). There is a utility available at the above
FTP sites called dn2ethaddr which can compute the correct ethernet
-address to use. The address can be set by ifconfig either before at
+address to use. The address can be set by ifconfig either before or
at the time the device is brought up. If you are using RedHat you can
add the line:
diff --git a/Documentation/networking/e1000.txt b/Documentation/networking/e1000.txt
index 71fe15af356c..5c0a5cc03998 100644
--- a/Documentation/networking/e1000.txt
+++ b/Documentation/networking/e1000.txt
@@ -350,7 +350,7 @@ Additional Configurations
As an example, if you install the e1000 driver for two PRO/1000 adapters
(eth0 and eth1) and set the speed and duplex to 10full and 100half, add
- the following to modules.conf or or modprobe.conf:
+ the following to modules.conf or modprobe.conf:
alias eth0 e1000
alias eth1 e1000
diff --git a/Documentation/networking/s2io.txt b/Documentation/networking/s2io.txt
index bd528ffbeb4b..4bde53e85f3f 100644
--- a/Documentation/networking/s2io.txt
+++ b/Documentation/networking/s2io.txt
@@ -126,7 +126,7 @@ However, you may want to set PCI latency timer to 248.
#setpci -d 17d5:* LATENCY_TIMER=f8
For detailed description of the PCI registers, please see Xframe User Guide.
b. Use 2-buffer mode. This results in large performance boost on
-on certain platforms(eg. SGI Altix, IBM xSeries).
+certain platforms(eg. SGI Altix, IBM xSeries).
c. Ensure Receive Checksum offload is enabled. Use "ethtool -K ethX" command to
set/verify this option.
d. Enable NAPI feature(in kernel configuration Device Drivers ---> Network
diff --git a/Documentation/networking/sk98lin.txt b/Documentation/networking/sk98lin.txt
index 82ce5547db47..4e1cc745ec63 100644
--- a/Documentation/networking/sk98lin.txt
+++ b/Documentation/networking/sk98lin.txt
@@ -497,7 +497,7 @@ Solution: In /proc/pci search for the following entry:
www.syskonnect.com
Some COMPAQ machines have problems dealing with PCI under Linux.
- Linux. This problem is described in the 'PCI howto' document
+ This problem is described in the 'PCI howto' document
(included in some distributions or available from the
web, e.g. at 'www.linux.org').