diff options
| author | William Hubbs <w.d.hubbs@gmail.com> | 2012-10-28 14:29:33 -0500 |
|---|---|---|
| committer | William Hubbs <w.d.hubbs@gmail.com> | 2012-10-28 14:29:33 -0500 |
| commit | ff2e1d42a2d553b831ea914b16d0e32a99dafec4 (patch) | |
| tree | ef76fca8b415286a676a7f4d663179c9a9f6d474 | |
| parent | e634376482e70e40aab460ca1f60a4e5a5522bba (diff) | |
Oldnet: make carrier timeout documentation consistent
| -rw-r--r-- | doc/net.example.BSD.in | 11 | ||||
| -rw-r--r-- | doc/net.example.Linux.in | 12 |
2 files changed, 10 insertions, 13 deletions
diff --git a/doc/net.example.BSD.in b/doc/net.example.BSD.in index 6cd2cafe..fb25215e 100644 --- a/doc/net.example.BSD.in +++ b/doc/net.example.BSD.in @@ -80,9 +80,9 @@ # Most drivers that report carrier status function correctly, but some do not # One of these faulty drivers is for the Intel e1000 network card, but only # at boot time. To get around this you may alter the carrier_timeout value for -# the interface. -1 is disable, 0 is infinite and any other number of seconds -# is how long we wait for carrier. The current default is 3 seconds -#carrier_timeout_eth0=-1 +# the interface. 0 is disable and any other number of seconds is how +# long we wait for carrier. The current default is disabled. +#carrier_timeout_eth0=0 # You may wish to disable the interface being brought down when stopping. # This is only of use for WakeOnLan. @@ -368,11 +368,6 @@ #rc-update add devd boot #rc -# Set carrier detection timeout. -# This allows the interface to only start if there is a carrier. The -# default setting is 0 which means to ignore this. -# carrier_timeout_eth0=0 - ############################################################################## # ADVANCED CONFIGURATION # diff --git a/doc/net.example.Linux.in b/doc/net.example.Linux.in index eb09a483..70ae4e92 100644 --- a/doc/net.example.Linux.in +++ b/doc/net.example.Linux.in @@ -126,6 +126,13 @@ # tables you may have to set a global metric as the due to a simple read of # the routing table taking over a minute at a time. +# Most drivers that report carrier status function correctly, but some do not +# One of these faulty drivers is for the Intel e1000 network card, but only +# at boot time. To get around this you may alter the carrier_timeout value for +# the interface. 0 is disable and any other number of seconds is how +# long we wait for carrier. The current default is disabled. +#carrier_timeout_eth0=0 + # You may wish to disable the interface being brought down when stopping. # This is only of use for WakeOnLan. #ifdown_eth0="NO" @@ -1130,11 +1137,6 @@ # Hypothetical network card that requires a change-eeprom toggle to enable flashing #ethtool_order_eth0="change-eeprom flash change pause coalesce ring offload nfc rxfh-indir ntuple" -# Set carrier detection timeout. -# This allows the interface to only start if there is a carrier. The -# default setting is 0 which means to ignore this. -# carrier_timeout_eth0=0 - ############################################################################## # ADVANCED CONFIGURATION # |