On Tue, Sep 04, 2018 at 07:07:37AM +0000, Oleg.Karfich@xxxxxxxx wrote:
> Signed-off-by: Oleg Karfich <oleg.karfich@xxxxxxxx>
> ---
>
> Changes in v2:
>
> - use globalvar_add_simple_int
> - set default value to global variable
> - and use the global variable in dhcp requests :-)
>
> ---
This is not exactly a v2 but a fixup for the original patch. Squashed
the to patches into one and applied, thanks
Sascha
> net/dhcp.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/net/dhcp.c b/net/dhcp.c
> index 92e0501..984d32a 100644
> --- a/net/dhcp.c
> +++ b/net/dhcp.c
> @@ -448,7 +448,7 @@ static char *global_dhcp_bootfile;
> static char *global_dhcp_oftree_file;
> static char *global_dhcp_rootpath;
> static char *global_dhcp_tftp_server_name;
> -static char *global_dhcp_retries;
> +static int global_dhcp_retries = DHCP_DEFAULT_RETRY;
> static char *global_dhcp_option224;
>
> static void set_res(char **var, const char *res)
> @@ -485,7 +485,7 @@ int dhcp_request(struct eth_device *edev, const struct dhcp_req_param *param,
> if (!dhcp_param.option224)
> dhcp_param.option224 = global_dhcp_option224;
> if (!dhcp_param.retries)
> - dhcp_param.retries = DHCP_DEFAULT_RETRY;
> + dhcp_param.retries = global_dhcp_retries;
>
> dhcp_con = net_udp_eth_new(edev, IP_BROADCAST, PORT_BOOTPS, dhcp_handler, NULL);
> if (IS_ERR(dhcp_con)) {
> @@ -630,7 +630,7 @@ static int dhcp_global_init(void)
> globalvar_add_simple_string("dhcp.user_class", &global_dhcp_user_class);
> globalvar_add_simple_string("dhcp.oftree_file", &global_dhcp_oftree_file);
> globalvar_add_simple_string("dhcp.tftp_server_name", &global_dhcp_tftp_server_name);
> - globalvar_add_simple_string("dhcp.retries", &global_dhcp_retries);
> + globalvar_add_simple_int("dhcp.retries", &global_dhcp_retries, "%u");
> globalvar_add_simple_string("dhcp.option224", &global_dhcp_option224);
>
> return 0;
> --
> 2.7.4
>
> _______________________________________________
> barebox mailing list
> barebox@xxxxxxxxxxxxxxxxxxx
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
