[batctl] master: batctl: Don't stop when create_interface detected existing interface (5d465bf)
by postmaster@open-mesh.org
Repository : ssh://git@diktynna/batctl
On branch : master
>---------------------------------------------------------------
commit 5d465bfd9a19c4bda20fb4e36c6e4b22c56ceb17
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Fri Jan 15 23:38:31 2021 +0100
batctl: Don't stop when create_interface detected existing interface
"batctl meshif bat0 interface add ..." should never be called in parallel.
But when something still does this, it could be that the code first detects
the missing meshif and then tries to create it - which fails when another
process requested the creation of the same interface slightly before batctl
did it.
But this should not prevent batctl to add the lower interface to the
meshif. It is not really important that the batctl process was the one
which created it - only that it exists is important.
Fixes: 25022e0b154d ("batctl: Use rtnl to add/remove interfaces")
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
5d465bfd9a19c4bda20fb4e36c6e4b22c56ceb17
interface.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/interface.c b/interface.c
index d0d9435..f7397b8 100644
--- a/interface.c
+++ b/interface.c
@@ -479,7 +479,7 @@ static int interface(struct state *state, int argc, char **argv)
ifmaster = if_nametoindex(state->mesh_iface);
if (!manual_mode && !ifmaster && rest_argv[0][0] == 'a') {
ret = create_interface(state->mesh_iface);
- if (ret < 0) {
+ if (ret < 0 && ret != -EEXIST) {
fprintf(stderr,
"Error - failed to create batman-adv interface: %s\n",
strerror(-ret));
6 days, 2 hours
[batctl] master: Merge branch 'maint' (a0da92b)
by postmaster@open-mesh.org
Repository : ssh://git@diktynna/batctl
On branch : master
>---------------------------------------------------------------
commit a0da92b735f92fed42104614962b165acb751b2f
Merge: aa0e498 5d465bf
Author: Sven Eckelmann <sven(a)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));
6 days, 2 hours
[linux-merge]linux integration; annotated tag, v4.9.252, created. v4.9.252
by postmaster@open-mesh.org
The annotated tag, v4.9.252 has been created
at 7c4231ba1d64b1a2b7408948dc9e74464a250140 (tag)
tagging 10161a5e7a07212efa9152f31611570ba95b3b24 (commit)
replaces v4.9.248
tagged by Greg Kroah-Hartman
on Sun Jan 17 13:58:18 2021 +0100
- Shortlog ------------------------------------------------------------
This is the 4.9.252 stable release
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmAENGoACgkQONu9yGCS
aT5lnQ/+OITdOiJDlPbfHF7D0rjbs51uLpec4MzxZ8+z6Pvrsg2yuhLSU2XjQvjK
dNy8vMU6F1e6+A9C7IgOEcayO21RwF+xbKJ3F88/okHiGMhOdCLL8KgitHu5yLwK
PdGN0jJy/31GGddyvUlnxAkLFLcZAe2UkojwRWO0tcTCPmWxjQ7RSdpEVtHBn25J
3399K6Mk6erMOSRcddCOweoO+Kp2T+CAEq43Iy1W3iq36ilNYkbJASi9DM+rd3YX
gve8N1e87mhunro93+SUpD85KxFy0ArIbSEKsvDYeE2hg9ax4vXvKpAJ5QgoX2Wg
ucMQDo1aq/w58iKCOiSuyBqxFVS0ZFdGA4h0R8hNSX0ptc1o9IUlYsivfEYP4rlK
MFQGSyPFBgAuAxOS0v9XdkyEiSyfw51UoYJ6kmE8CkRWEFEImpYFatCgp4eTWwCX
CyE1f3qmUxUEdiVT396vM0ty23S//LxLLKIh3VmGips9xdataBikdGUk+2eKVVUJ
2iJuV7Fqd742hIuFcecD6coXn9P/WznVo5QH4j0m5REnv4U9et+CQkU/jWHATBVr
yhtqalwYPBcM4dFRoOHW6II2QduBrhEtr0U07Tk9IthQ/Dd/occyEG/V4AIu4I3z
enY8JAgM7122qWON265XIL8KyIsnlQQ2hoegndHan+Vj9DeJkBE=
=I/Ck
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
6 days, 2 hours
[linux-merge]linux integration; annotated tag, v4.14.216, created. v4.14.216
by postmaster@open-mesh.org
The annotated tag, v4.14.216 has been created
at 3f1c6300d9ec9356942e0bef0a69887858e84e99 (tag)
tagging 2762b48e9611529239da2e68cba908dbbec9805f (commit)
replaces v4.14.212
tagged by Greg Kroah-Hartman
on Sun Jan 17 13:59:30 2021 +0100
- Shortlog ------------------------------------------------------------
This is the 4.14.216 stable release
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmAENLIACgkQONu9yGCS
aT4rGQ//Q2kdwTMFdQPXdsQyVkKzuygOWImVYEbImg+2Ywufl3CLMee1w0g+Wbyd
vtPW0Mc9kMje3aFZisV0IzaRbkrr77nDbX0ydQJq3287yuhvW9Y9nyw3HSoBG4hv
p0VyTLB65rK/dTdQGLQ6Pef58nvAtuNfYVpbLjaxan136IMPgof8yL1Vpg9vxbnG
LyfT+eUDX+ptbtq5eqqv8PSYXexeas4V+qXnT++Q+yfCR/kXAF5hDB245T8xE/lZ
ZLsGF/lyZxMDTGePLUWiCVUN4y0g47Dx+/YUBhOmxFwBQel5paDkhY3KW0SU9SGl
tq+Rw7heeoLVMLHMJ+tgzib6NV2B3qHpLqCKOSdQkplemIOpYg7vqltMs9uJFeBf
CSBjMytSCvo9rwABea6rKKDUHuGmjjN7YOf3SaWvBzH353U8XyjZXCA9Ams1607u
x0rMVOXAiG3ZNop8jCGkphYRqi2T11450sOMlJByRBPQJgLGzBfA/VGiSC0Jqwsa
cdQTr91Ml3qWVoHhoTJh33x7rS3HtaNQWgXvlG/Hb7WISD3LEp/UlYXqbuREt5b2
Oqe7MVU5KR61xeozmvaVHE1ETzUeGmoL5VIa2YkKP2WLOK+HSYlegh4R+Pd/nWX0
7RubjMEL9P8DmDRkKpsdkITBd96wmPY4kB/pMtKL0GyIE6Oj1m0=
=27ld
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
6 days, 2 hours
[linux-merge]linux integration; annotated tag, v4.19.169, created. v4.19.169
by postmaster@open-mesh.org
The annotated tag, v4.19.169 has been created
at 09096cbdf738602a6f62b0349ab572617dfd7d44 (tag)
tagging 43d555d83c3f1fb8168367ca5b47c3a6570ca487 (commit)
replaces v4.19.163
tagged by Greg Kroah-Hartman
on Tue Jan 19 18:25:27 2021 +0100
- Shortlog ------------------------------------------------------------
This is the 4.19.169 stable release
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmAHFgcACgkQONu9yGCS
aT7vaw//QfIjoGSMrv88n6b+2CBKU7yZyUqDhV1YvfLs3CwAHc0NDrBgmHanje5j
SIBBoa0PhzhzVE2zPMLlfWisGs8dt0844R5LL+Kc8h7oa7OCSKY1tws8lm9L0qgj
DE5/DD1ztmg9glKhiJyQxRwZfbWQlp2eAyN8TEqKCrfxrP2UOW6JNW0dMniqACvM
CmPNgopFfnObTVSjbLYYlonJJsOE++EUue5XN+MvBQSOaamTBOB5cwr3esEG0RX7
GGu+P0dQXpJUythkqypDCH2LVe95szOeCEwmTFnQKauFLYQijVx0s4kMSiiU/ByP
o0sHFOSdsayi5rOYek3lnomnzqzWvQgIrs3VqkXhT//j8hcXE0+owYvNbpTbC4c6
E8qULLht6pahtD/53MYk0XGDC6y5uIgbIQGQylWyg4+bZFfnXlz6UErrFXM/gyEp
0uARhrwJT3BmKsNQPKsTCWuzpfVuKCTseYfpiOZMqZptyKtFyWSnCvyTRyPk4ZvS
VeMXG46qENiWDXUrvggL9zK4bzgqsyneLbzkJ6eqEA9YxE7MPlH6I4TUhjPm4KWl
CHMl60lDwA/N/M76WiPkHVXp1/ODpnK2ebKRXSM2goT0/jsOA2CTLVGSQ9tzH4e4
7zrnG0JnETw6ib2w4rfKJRi/OSS49r03lO2PnrLOexA4Y+U8daI=
=H0Tc
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
6 days, 2 hours
[linux-merge]linux integration; annotated tag, v5.4.91, created. v5.4.91
by postmaster@open-mesh.org
The annotated tag, v5.4.91 has been created
at cc1908343b61c14f2f710112627228db205b8e29 (tag)
tagging d26b3110041a9fddc6c6e36398f53f7eab8cff82 (commit)
replaces v5.4.85
tagged by Greg Kroah-Hartman
on Tue Jan 19 18:26:33 2021 +0100
- Shortlog ------------------------------------------------------------
This is the 5.4.91 stable release
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmAHFkkACgkQONu9yGCS
aT5DMg//TWHV1loe76Jy6mT7SavddKkO+C6YXdGMYN4vVKJqYzASSqqmkIGYZVOj
G5GnILybNjA9aJIqX4vXTXs3YslWZN+rd//GYRyBTE7SwlNI8Lho1ZJq8VqtWo+x
jxm+2QNX8wBb9QuCqsnLOVidWVOQ9dcz0GC6/N8gKcAWJ71B2RpwKQxnEXjlJp3f
m5cX+Vnm3XnJkdT4mmycV3h4gnOrwhIUGbu8iLbPTmfZf5aZ14eD2Su8gpcunWat
7JY2z1u4jSpkKspG5eVn8wmL1aB5+WhkqU5+rOtHZ+KJZvRY0wTnmIQEBCw0bAW+
49tIthuJF8wC7oa3hXoXMNG8K112ffeeF2Hm29WFbpFYRinIjGt/MPmg2A1sM+C1
jVQewVOArNLA0lo5m1jun2/c56EEGFKKODzJR7Epphdi+bsY7DSttIfIIzwUqTc5
9wgZG81+l9uP/ohTm7vG8hQcANt0DN+X8wet+HqpuO5Mj5T6150dKW4zQhdOljBH
GL/O/31DfIUmLJL50+X6kn47c0noZlwEmZc+buVxdO5bC27cK6awEE3gQeCTgsWj
Ok1Sa+3FwwEPnKs8zInYP69U/obvNxBhdxrccrUOViGBxsXKHMPEnXG2bUuiV/7v
KnuO9z1Pj3+YAdZTwWygdJcZNdCAwGL4ekQV9N/Pxeg6ejq2E3Q=
=TOgX
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
6 days, 2 hours
[linux-merge]linux integration; annotated tag, v5.10.9, created. v5.10.9
by postmaster@open-mesh.org
The annotated tag, v5.10.9 has been created
at 984bc0a86b20b7d413ea5ebebdf715467faf39d1 (tag)
tagging e2d133180bbc28a48316e67a003796885580b087 (commit)
replaces v5.10.3
tagged by Greg Kroah-Hartman
on Tue Jan 19 18:27:51 2021 +0100
- Shortlog ------------------------------------------------------------
This is the 5.10.9 stable release
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmAHFpcACgkQONu9yGCS
aT4Vhw/+JLscHnfK//hbS6Nx95MY95VMzy+p2ccADXRy3O/5nr0HwGKnXTKB4Bg+
05S3Hv9ZU/XSszLWvgFQ0Z0peU241ASPz1uLTgtpziBT5plXa5eJULBZ+WknWMef
dNKpvKPphpEbQ0yz6o/4sbNAdiI9BzyGCOicQ2dl9nY7R/JA9YHquUD7iHMnvbs+
yxwwawNHVwszUT/fJT3iFzOAehHGAttHdf3z/bGPS1ogy2S7J5IluJgTAibd3P7G
5o7OUUA5ujEtjBLIkA61fqeL2Qaci83Ff/8KEPEfF1JeLBbMHYcLHnz3RAwBaLZh
nlM4smyTeekcnHIzyRGw16OmpoYwY3MQAt+UFLCzKhlnscB0UqCNkA9zQA9k/taw
cy7/fe5hWFU9DRv4uTUT2H1tkP+pNQ5eIaejPHMtld5JlYXoDN4RyQq7sAyMQgBj
CXADStYSR/f5sWWgRbRs1F7E0lrePsVpjOcqHXxbsS+52yN2CZSKazlOIJ9xArfM
cTzzLUuYbMZoHjIDdMMkjA41VMmyJ+BKrqEgzu3LsJQs57o/ckjnQx4VV5YiHhci
v35OL8oa9IZi8WQikB9bx2WZRWUChOGKwMNeeUwEFD4Zmye1OtyyHuzYQf9QSjRv
zbf1owwsg3xnfkvLcfru8mNMgJkgG8RpuNNVPO8boWZ4pgPu2tk=
=5K55
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
6 days, 2 hours
[linux-merge]linux integration; annotated tag, v4.4.252, created. v4.4.252
by postmaster@open-mesh.org
The annotated tag, v4.4.252 has been created
at 65195dcae4e8847ca87c0b9d826f121fd7e4cf86 (tag)
tagging 4328b0f47a72b408ff9038a79817b3698281914f (commit)
replaces v4.4.248
tagged by Greg Kroah-Hartman
on Sun Jan 17 13:57:14 2021 +0100
- Shortlog ------------------------------------------------------------
This is the 4.4.252 stable release
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmAENCoACgkQONu9yGCS
aT6dBw/+J7XFXB4757sWi1d5goFkIEIUSlw8cDXVuetMRaPsg8fzEBCBJkQ4CFWt
9no/ZUUndXypTlzGGselpxk2vah+V4XMhzEI/3RaONV9AvRKeSO4pIiVt6K8TjV7
canYTLu+4EKQCHNMhHYSJ6aJizZ92/nD7U8kxGJXGlOcbogT5h0pdvVhFOpaV1ZH
ttQ6fEQ+aoEE2OaFtiFO2Shz3XJQfiG8MVtzMj+WUtLnPcAxiUxvExRKSBcdKOLZ
OobsIZN3zQpsRoPPXR+gfWfyCZ4M/QZf0r2C7kBYj7Z2Gk9hwpjWJ2BPjTZTURKv
4fo7AdRuzPgcmV8T8VYRsBYLMyx7m5f3+w0DAbkm3EJeqFUw9uCWjjLhYl9jg5o5
HmXAhLry/Ddt5IrPXm7RmCPdjA6WxmJncGFOQk3oILM3if56AgC3hiqp8Y7Ucl7l
IVuU2LBJZYlF5HZNCNvk24BwHJ91wcfEobTbSCM6vTlhwGEXbnUDcDJVaMSKSryQ
fETUnVqRUUYXYVN8vyqm1GkSpDToNwhd8XgFxAKxtvPXHHmLAVHFyvBQTfF8DZp4
0wB/ahWtYNOMNwuTsKhvyu6oGmE0nRKByASELJtA5xdoO0sg+EwhS8Xc2/4k0KQ3
Z5Oqjgb2CuuNpGN7l3Ltsax28ssUHm852F/fKtF1j8hrCNj36bo=
=Y8xS
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
6 days, 2 hours
[linux-merge]linux integration; annotated tag, v5.11-rc4, created. v5.11-rc4
by postmaster@open-mesh.org
The annotated tag, v5.11-rc4 has been created
at 7341df6992e7840498cff6ad21380aa7dd97870b (tag)
tagging 19c329f6808995b142b3966301f217c831e7cf31 (commit)
replaces v5.11-rc3
tagged by Linus Torvalds
on Sun Jan 17 16:37:05 2021 -0800
- Shortlog ------------------------------------------------------------
Linux 5.11-rc4
-----BEGIN PGP SIGNATURE-----
iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAmAE2DEeHHRvcnZhbGRz
QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGgeUH/jmfqv+ieSitqsnO
fmOp6w0Ia8w/PnvUq6cp+4hrhnxrjpN+dnoMgnSZ92g98zDQWamn3Wp6Anc/KSCJ
MdBxTRJtgzu/b1+zqZm7tu1W+HPedwT3/kFStF4QQWgfveg/0EHr3TDfKQSBscCV
gP21L7FKSaTBVJdIBvkYdlHq/bIuNdKaen+JBG28w3/WqTJDmCCU3Pw8vQYEMACq
C/exg0XQDndPpGKnnCOcG2wy2VjmUvg96cVWpYnQC8Rwqy9AHPFdKI4Y9F86lRpq
7bLGenP8UadUkSOhunv359TDb0L3j6l8qjZ41LwgbtkT2ZkgWjfWwDqSPZnJQ4ZO
0G1j8Io=
=gBVY
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
6 days, 23 hours