diff options
Diffstat (limited to 'Documentation/networking')
| -rw-r--r-- | Documentation/networking/bonding.txt | 2 | ||||
| -rw-r--r-- | Documentation/networking/sk98lin.txt | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/Documentation/networking/bonding.txt b/Documentation/networking/bonding.txt index b0fe41da007b..8d8b4e5ea184 100644 --- a/Documentation/networking/bonding.txt +++ b/Documentation/networking/bonding.txt | |||
| @@ -945,7 +945,6 @@ bond0 Link encap:Ethernet HWaddr 00:C0:F0:1F:37:B4 | |||
| 945 | collisions:0 txqueuelen:0 | 945 | collisions:0 txqueuelen:0 |
| 946 | 946 | ||
| 947 | eth0 Link encap:Ethernet HWaddr 00:C0:F0:1F:37:B4 | 947 | eth0 Link encap:Ethernet HWaddr 00:C0:F0:1F:37:B4 |
| 948 | inet addr:XXX.XXX.XXX.YYY Bcast:XXX.XXX.XXX.255 Mask:255.255.252.0 | ||
| 949 | UP BROADCAST RUNNING SLAVE MULTICAST MTU:1500 Metric:1 | 948 | UP BROADCAST RUNNING SLAVE MULTICAST MTU:1500 Metric:1 |
| 950 | RX packets:3573025 errors:0 dropped:0 overruns:0 frame:0 | 949 | RX packets:3573025 errors:0 dropped:0 overruns:0 frame:0 |
| 951 | TX packets:1643167 errors:1 dropped:0 overruns:1 carrier:0 | 950 | TX packets:1643167 errors:1 dropped:0 overruns:1 carrier:0 |
| @@ -953,7 +952,6 @@ eth0 Link encap:Ethernet HWaddr 00:C0:F0:1F:37:B4 | |||
| 953 | Interrupt:10 Base address:0x1080 | 952 | Interrupt:10 Base address:0x1080 |
| 954 | 953 | ||
| 955 | eth1 Link encap:Ethernet HWaddr 00:C0:F0:1F:37:B4 | 954 | eth1 Link encap:Ethernet HWaddr 00:C0:F0:1F:37:B4 |
| 956 | inet addr:XXX.XXX.XXX.YYY Bcast:XXX.XXX.XXX.255 Mask:255.255.252.0 | ||
| 957 | UP BROADCAST RUNNING SLAVE MULTICAST MTU:1500 Metric:1 | 955 | UP BROADCAST RUNNING SLAVE MULTICAST MTU:1500 Metric:1 |
| 958 | RX packets:3651769 errors:0 dropped:0 overruns:0 frame:0 | 956 | RX packets:3651769 errors:0 dropped:0 overruns:0 frame:0 |
| 959 | TX packets:1643480 errors:0 dropped:0 overruns:0 carrier:0 | 957 | TX packets:1643480 errors:0 dropped:0 overruns:0 carrier:0 |
diff --git a/Documentation/networking/sk98lin.txt b/Documentation/networking/sk98lin.txt index 851fc97bb22f..7837c53fd5fe 100644 --- a/Documentation/networking/sk98lin.txt +++ b/Documentation/networking/sk98lin.txt | |||
| @@ -91,7 +91,7 @@ To use the driver as a module, proceed as follows: | |||
| 91 | with (M) | 91 | with (M) |
| 92 | 5. Execute the command "make modules". | 92 | 5. Execute the command "make modules". |
| 93 | 6. Execute the command "make modules_install". | 93 | 6. Execute the command "make modules_install". |
| 94 | The appropiate modules will be installed. | 94 | The appropriate modules will be installed. |
| 95 | 7. Reboot your system. | 95 | 7. Reboot your system. |
| 96 | 96 | ||
| 97 | 97 | ||
| @@ -245,7 +245,7 @@ Default: Both | |||
| 245 | This parameters is only relevant if auto-negotiation for this port is | 245 | This parameters is only relevant if auto-negotiation for this port is |
| 246 | not set to "Sense". If auto-negotiation is set to "On", all three values | 246 | not set to "Sense". If auto-negotiation is set to "On", all three values |
| 247 | are possible. If it is set to "Off", only "Full" and "Half" are allowed. | 247 | are possible. If it is set to "Off", only "Full" and "Half" are allowed. |
| 248 | This parameter is usefull if your link partner does not support all | 248 | This parameter is useful if your link partner does not support all |
| 249 | possible combinations. | 249 | possible combinations. |
| 250 | 250 | ||
| 251 | Flow Control | 251 | Flow Control |