diff options
| author | Simon Rettberg | 2020-08-12 12:27:02 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2020-08-12 12:27:02 +0200 |
| commit | df1f1c469e65156c18dd98931618a7d37c9d8691 (patch) | |
| tree | 12bf4fe1a74701b5f86a696d1e28822dac055765 /src/hci | |
| parent | Revert "Revert "[build] Construct full version number automatically from git ... (diff) | |
| parent | [efi] Use device path to locate filesystem from which we were loaded (diff) | |
| download | ipxe-df1f1c469e65156c18dd98931618a7d37c9d8691.tar.gz ipxe-df1f1c469e65156c18dd98931618a7d37c9d8691.tar.xz ipxe-df1f1c469e65156c18dd98931618a7d37c9d8691.zip | |
Merge branch 'master' into openslx
Diffstat (limited to 'src/hci')
| -rw-r--r-- | src/hci/commands/ifmgmt_cmd.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/hci/commands/ifmgmt_cmd.c b/src/hci/commands/ifmgmt_cmd.c index c89af2e81..2e976d3fb 100644 --- a/src/hci/commands/ifmgmt_cmd.c +++ b/src/hci/commands/ifmgmt_cmd.c @@ -193,6 +193,8 @@ static int ifstat_exec ( int argc, char **argv ) { /** "ifconf" options */ struct ifconf_options { + /** Configuration timeout */ + unsigned long timeout; /** Configurator */ struct net_device_configurator *configurator; }; @@ -202,6 +204,9 @@ static struct option_descriptor ifconf_opts[] = { OPTION_DESC ( "configurator", 'c', required_argument, struct ifconf_options, configurator, parse_netdev_configurator ), + OPTION_DESC ( "timeout", 't', required_argument, + struct ifconf_options, timeout, + parse_timeout ), }; /** @@ -216,7 +221,8 @@ static int ifconf_payload ( struct net_device *netdev, int rc; /* Attempt configuration */ - if ( ( rc = ifconf ( netdev, opts->configurator ) ) != 0 ) { + if ( ( rc = ifconf ( netdev, opts->configurator, + opts->timeout ) ) != 0 ) { /* Close device on failure, to avoid memory exhaustion */ netdev_close ( netdev ); |