Repository : ssh://git@diktynna/batctl

On branch : master

commit a0da92b735f92fed42104614962b165acb751b2f Merge: aa0e498 5d465bf Author: Sven Eckelmann sven@narfation.org Date: Tue Jan 19 21:34:27 2021 +0100

Merge branch 'maint'

a0da92b735f92fed42104614962b165acb751b2f interface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc interface.c index 77ca1a0,f7397b8..7f77459 --- a/interface.c +++ b/interface.c @@@ -525,8 -478,8 +525,8 @@@ static int interface(struct state *stat /* get index of batman-adv interface - or try to create it */ ifmaster = if_nametoindex(state->mesh_iface); if (!manual_mode && !ifmaster && rest_argv[0][0] == 'a') { - ret = create_interface(state->mesh_iface); + ret = create_interface(state->mesh_iface, &create_params); - if (ret < 0) { + if (ret < 0 && ret != -EEXIST) { fprintf(stderr, "Error - failed to create batman-adv interface: %s\n", strerror(-ret));