diff options
| author |   Martin Kepplinger <martin.kepplinger@ginzinger.com> | 2019-01-31 11:14:18 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-02-01 15:24:13 -0800 |
| commit | 3fc46fc9f68c71e21afde62984444b2ffdd1ea90 (patch) | |
| tree | dde61921c95851ae913466e90d645e2968d17f31 /Documentation | |
| parent | ipv4: fib: use struct_size() in kzalloc() (diff) | |
| download | linux-dev-3fc46fc9f68c71e21afde62984444b2ffdd1ea90.tar.xz linux-dev-3fc46fc9f68c71e21afde62984444b2ffdd1ea90.zip | |
ipconfig: add carrier_timeout kernel parameter
commit 3fb72f1e6e61 ("ipconfig wait for carrier") added a
"wait for carrier" policy, with a fixed worst case maximum wait
of two minutes.
Now make the wait for carrier timeout configurable on the kernel
commandline and use the 120s as the default.
The timeout messages introduced with
commit 5e404cd65860 ("ipconfig: add informative timeout messages while
waiting for carrier") are done in a fixed interval of 20 seconds, just
like they were before (240/12).
Signed-off-by: Martin Kepplinger <martin.kepplinger@ginzinger.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/admin-guide/kernel-parameters.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index b799bcf67d7b..7afb2fedde0a 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -461,6 +461,11 @@ possible to determine what the correct size should be. This option provides an override for these situations. + carrier_timeout= + [NET] Specifies amount of time (in seconds) that + the kernel should wait for a network carrier. By default + it waits 120 seconds. + ca_keys= [KEYS] This parameter identifies a specific key(s) on the system trusted keyring to be used for certificate trust validation. |