On 13.08.21 10:32, Marco Felsch wrote: > Without this change the only possible way to start the > fastboot.net.autostart mechanism is by using the nv storage. Split > fastboot_on_boot() into two functions: > - a globalvar setter fastboot_net_autostart_set() and > - a the globalvar init function fastboot_net_init_globalvar(). > This allows init scripts to start the autostart mechanism as well. > > Signed-off-by: Marco Felsch <[email protected]>
Reviewed-by: Ahmad Fatoum <[email protected]> > --- > net/fastboot.c | 19 +++++++++++++------ > 1 file changed, 13 insertions(+), 6 deletions(-) > > diff --git a/net/fastboot.c b/net/fastboot.c > index df388adc89..aa483f57a7 100644 > --- a/net/fastboot.c > +++ b/net/fastboot.c > @@ -547,14 +547,12 @@ fail_generic_init: > static struct fastboot_net *fastboot_net_obj; > static int fastboot_net_autostart; > > -static int fastboot_on_boot(void) > +static int fastboot_net_autostart_set(struct param_d *p, void * priv) > { > struct fastboot_net *fbn; > + static bool started; > > - globalvar_add_simple_bool("fastboot.net.autostart", > - &fastboot_net_autostart); > - > - if (!fastboot_net_autostart) > + if (!fastboot_net_autostart || started) > return 0; > > ifup_all(0); > @@ -564,16 +562,25 @@ static int fastboot_on_boot(void) > return PTR_ERR(fbn); > > fastboot_net_obj = fbn; > + started = true; > + > return 0; > } > > +static int fastboot_net_init_globalvar(void) > +{ > + return globalvar_add_bool("fastboot.net.autostart", > + fastboot_net_autostart_set, > + &fastboot_net_autostart, NULL); > +} > + > static void fastboot_net_exit(void) > { > if (fastboot_net_obj) > fastboot_net_free(fastboot_net_obj); > } > > -postenvironment_initcall(fastboot_on_boot); > +postenvironment_initcall(fastboot_net_init_globalvar); > predevshutdown_exitcall(fastboot_net_exit); > > BAREBOX_MAGICVAR(global.fastboot.net.autostart, > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
