aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/networking
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/networking')
-rw-r--r--Documentation/networking/bonding.txt4
-rw-r--r--Documentation/networking/wan-router.txt4
2 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/networking/bonding.txt b/Documentation/networking/bonding.txt
index 24d029455baa..a55f0f95b171 100644
--- a/Documentation/networking/bonding.txt
+++ b/Documentation/networking/bonding.txt
@@ -1241,7 +1241,7 @@ traffic while still maintaining carrier on.
1241 1241
1242 If running SNMP agents, the bonding driver should be loaded 1242 If running SNMP agents, the bonding driver should be loaded
1243before any network drivers participating in a bond. This requirement 1243before any network drivers participating in a bond. This requirement
1244is due to the the interface index (ipAdEntIfIndex) being associated to 1244is due to the interface index (ipAdEntIfIndex) being associated to
1245the first interface found with a given IP address. That is, there is 1245the first interface found with a given IP address. That is, there is
1246only one ipAdEntIfIndex for each IP address. For example, if eth0 and 1246only one ipAdEntIfIndex for each IP address. For example, if eth0 and
1247eth1 are slaves of bond0 and the driver for eth0 is loaded before the 1247eth1 are slaves of bond0 and the driver for eth0 is loaded before the
@@ -1937,7 +1937,7 @@ switches currently available support 802.3ad.
1937 If not explicitly configured (with ifconfig or ip link), the 1937 If not explicitly configured (with ifconfig or ip link), the
1938MAC address of the bonding device is taken from its first slave 1938MAC address of the bonding device is taken from its first slave
1939device. This MAC address is then passed to all following slaves and 1939device. This MAC address is then passed to all following slaves and
1940remains persistent (even if the the first slave is removed) until the 1940remains persistent (even if the first slave is removed) until the
1941bonding device is brought down or reconfigured. 1941bonding device is brought down or reconfigured.
1942 1942
1943 If you wish to change the MAC address, you can set it with 1943 If you wish to change the MAC address, you can set it with
diff --git a/Documentation/networking/wan-router.txt b/Documentation/networking/wan-router.txt
index aea20cd2a56e..c96897aa08b6 100644
--- a/Documentation/networking/wan-router.txt
+++ b/Documentation/networking/wan-router.txt
@@ -355,7 +355,7 @@ REVISION HISTORY
355 There is no functional difference between the two packages 355 There is no functional difference between the two packages
356 356
3572.0.7 Aug 26, 1999 o Merged X25API code into WANPIPE. 3572.0.7 Aug 26, 1999 o Merged X25API code into WANPIPE.
358 o Fixed a memeory leak for X25API 358 o Fixed a memory leak for X25API
359 o Updated the X25API code for 2.2.X kernels. 359 o Updated the X25API code for 2.2.X kernels.
360 o Improved NEM handling. 360 o Improved NEM handling.
361 361
@@ -514,7 +514,7 @@ beta2-2.2.0 Jan 8 2001
514 o Patches for 2.4.0 kernel 514 o Patches for 2.4.0 kernel
515 o Patches for 2.2.18 kernel 515 o Patches for 2.2.18 kernel
516 o Minor updates to PPP and CHLDC drivers. 516 o Minor updates to PPP and CHLDC drivers.
517 Note: No functinal difference. 517 Note: No functional difference.
518 518
519beta3-2.2.9 Jan 10 2001 519beta3-2.2.9 Jan 10 2001
520 o I missed the 2.2.18 kernel patches in beta2-2.2.0 520 o I missed the 2.2.18 kernel patches in beta2-2.2.0