[batman-adv] master: batman-adv: compat: Fix prandom.h include for older LTS kernels (fb9256b1)
by postmaster＠open-mesh.org
Repository : ssh://git@diktynna/batman-adv
On branch : master
>---------------------------------------------------------------
commit fb9256b1eb1fe7f8b277678aa689ad2074002309
Author: Sven Eckelmann <sven(a)narfation.org>
Date: Thu Oct 15 21:10:09 2020 +0200
batman-adv: compat: Fix prandom.h include for older LTS kernels
The longterm stable kernels 4.4.x and 4.9.x were missing the
linux/prandom.h for a long time but the commit c0842fbc1b18 ("random32:
move the pseudo-random 32-bit definitions to prandom.h") was recently
backported. Due to this change, it was no longer possible for batman-adv to
find the prandom_u32_max definition. This resulted in a build error:
net/batman-adv/bat_iv_ogm.c:284:18: error: undefined identifier 'prandom_u32_max'
net/batman-adv/bat_iv_ogm.c:292:43: error: undefined identifier 'prandom_u32_max'
net/batman-adv/bat_iv_ogm.c: In function ���batadv_iv_ogm_emit_send_time���:
net/batman-adv/bat_iv_ogm.c:284:11: error: implicit declaration of function ���prandom_u32_max��� [-Werror=implicit-function-declaration]
msecs += prandom_u32_max(2 * BATADV_JITTER);
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
fb9256b1eb1fe7f8b277678aa689ad2074002309
compat-include/linux/prandom.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/compat-include/linux/prandom.h b/compat-include/linux/prandom.h
index 2863a57d..9d30d2d9 100644
--- a/compat-include/linux/prandom.h
+++ b/compat-include/linux/prandom.h
@@ -12,6 +12,8 @@
#include <linux/version.h>
#if LINUX_VERSION_IS_GEQ(5, 8, 1) || \
+ (LINUX_VERSION_IS_GEQ(4, 4, 233) && LINUX_VERSION_IS_LESS(4, 5, 0)) || \
+ (LINUX_VERSION_IS_GEQ(4, 9, 233) && LINUX_VERSION_IS_LESS(4, 10, 0)) || \
(LINUX_VERSION_IS_GEQ(4, 14, 193) && LINUX_VERSION_IS_LESS(4, 15, 0)) || \
(LINUX_VERSION_IS_GEQ(4, 19, 138) && LINUX_VERSION_IS_LESS(4, 20, 0)) || \
(LINUX_VERSION_IS_GEQ(5, 4, 57) && LINUX_VERSION_IS_LESS(5, 5, 0)) || \
1 week, 1 day
[linux-merge]linux integration; annotated tag, v4.4.238, created. v4.4.238
by postmaster＠open-mesh.org
The annotated tag, v4.4.238 has been created
at 459fd5d2becd77549e8e310bdf6b5903f6c2b79c (tag)
tagging 18f617d6f398c264e3172532a5d3c656f17cecfa (commit)
replaces v4.4.232
tagged by Greg Kroah-Hartman
on Thu Oct 1 11:13:06 2020 +0200
- Shortlog ------------------------------------------------------------
This is the 4.4.238 stable release
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAl91naIACgkQONu9yGCS
aT7qjg//TA0icyBINDh6L7kR3RwJqz8KBCMUHO0S5nheyvySPR/5eDjsRUZrmaKl
KLzJqjtX3W24nAN+03uDDLkPlk7bIZ/35s+nFskrr2lHSOEXPDiN4UYOd0UvuDpX
RX3rDi2hbGy8KDlRLt4E/+xj6/emureVM0FTNNKbpwgHUH4EFYXKI7rqtNtYVfkE
H10NGGVGMtUjMyqkZf7M531Rm/g6oiBfK6H9jslrzXSmOwc2w/CSxKRDpS4XlcbJ
7fL/gCEqbH4P6Pb9RWIbEkKpPnQPpXcHo80nNGz7/BqdyMZwEOkGQkAACNfR1m0G
SSIWMbnNwpug+F67NRHP6nBqlkC9cmK9QFXMORL+pMp/A2CEIE93N5RkL2F74fwx
9Gtb4zzAvG5gj+KlLRMc/dJLq19g4Ou/OHbvsjBK7DVkZ6P8+Ijkop6vJ+ZvRQ2i
zpqxibRo6Ep0nrmBvhP2IilDS3XrtaYhJNfccrNYR23RxhCzj1hmkYi+Nk2jHWov
E34fHEESUPBgn60GY6TEUcFk8SKSJLU0Q8IOj2h5+BKve5kxy9ZamrZVbNLFEg+S
mTl6jHx6+KkjpHDfGWLmjGXXoEigR9L9ZrOn1+K5lJS5Ao8u3yM6ke9gIJn0l6Kr
OsvN75OUl82RCgLuwn8JPeP/CIc+Z25TUfk034QripnLeo+kjqM=
=HDy7
-----END PGP SIGNATURE-----
Jussi Kivilinna (1):
batman-adv: bla: use netif_rx_ni when not in interrupt context
Linus L��ssing (2):
batman-adv: bla: fix type misuse for backbone_gw hash indexing
batman-adv: mcast/TT: fix wrongly dropped or rerouted packets
Sven Eckelmann (1):
batman-adv: Avoid uninitialized chaddr when handling DHCP
-----------------------------------------------------------------------
--
linux integration
1 week, 5 days
[linux-merge]linux integration; annotated tag, v4.9.238, created. v4.9.238
by postmaster＠open-mesh.org
The annotated tag, v4.9.238 has been created
at bb3c3418c1510193ef58b16c4eb5f52d15a51a6f (tag)
tagging 716527d016c783b7bde0896b641c342c08809703 (commit)
replaces v4.9.232
tagged by Greg Kroah-Hartman
on Thu Oct 1 20:40:54 2020 +0200
- Shortlog ------------------------------------------------------------
This is the 4.9.238 stable release
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAl92IrYACgkQONu9yGCS
aT6rKw//XUQo2gUBArRiFngKRL2sexHJkfQ44Q1UFBDC68dUUqgJpMFJq7hOFGFI
tj2Jz0Jfps7gNshmZ7DDTJx3nTHIqRQL8Z/6FnVZ54gmUf+LlXDdbEaFTSx5n6Mj
7TvbijAtpW2uBPfvSDE+0o9mq+dOzqFtsaL2snJrYYf0Um8dXIWFfQAs+vemS8dv
7dVQOO9bB5xbNcq/1yqrWQwcux5q86D/U6dSTHPukQ5SjvGcH/0tVb9VYz9UOcZX
6PHBws9j3dvjShkEEEM3tBcQ7bNBRRyLrG+nALv9A0QSbZJKjw9G4Qa2tkWxD+uI
95WXhuqxyAFCDIy8ZE9QiuYhntdM3p5l4wY5bGKaPhFBSNMvyEFawBECJKNcvFNx
QJ3KS2KPm38RgmZC2QuPW69WMM7uWliw3kTOmeJf+xgS6LVBBsSTukL14/PmIvoC
sq9Y5M7xZDEkbakncEc+bIvIcNYfe/MJYpQSZhz4kl9xaFIaILaDYrGMIZxoBT6E
C1JFwtJhJAJCwj7jgEo1cg9Ck/v7Y/Zk8ezcNR7XhjGigMrITG20hcDZNLfmsdij
HiroGlmCaseOVCdYV6+0AyjW6+PUsBHjuzTdC9LdK2bkOu0+eeSyfY18CcWMmzsU
3V52Vkkc+SsUqWQyVAxP2gXElhMkAXbdl0HvtJkKRrWiEqXNQ6k=
=n+/5
-----END PGP SIGNATURE-----
Jussi Kivilinna (1):
batman-adv: bla: use netif_rx_ni when not in interrupt context
Linus L��ssing (3):
batman-adv: bla: fix type misuse for backbone_gw hash indexing
batman-adv: mcast/TT: fix wrongly dropped or rerouted packets
batman-adv: mcast: fix duplicate mcast packets in BLA backbone from mesh
Sven Eckelmann (2):
batman-adv: Avoid uninitialized chaddr when handling DHCP
batman-adv: Add missing include for in_interrupt()
-----------------------------------------------------------------------
--
linux integration
1 week, 5 days
[linux-merge]linux integration; annotated tag, v4.14.200, created. v4.14.200
by postmaster＠open-mesh.org
The annotated tag, v4.14.200 has been created
at f01cd256674cdcf18e49dec3f1960d3e5acf1932 (tag)
tagging bae31eef2a167ef160ab2703b6a2f5bbecd98d92 (commit)
replaces v4.14.193
tagged by Greg Kroah-Hartman
on Thu Oct 1 13:13:29 2020 +0200
- Shortlog ------------------------------------------------------------
This is the 4.14.200 stable release
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAl91udkACgkQONu9yGCS
aT5wdw//Wn7Nd1kcd1h2umXWcn2rjLbrflmFMtAY32YSDhT85EQaTQMckeLzVKSi
KPIPdNbjKhOirlizM6+mBv3EKn3bNbdDFeq0qGy0WI7DAT2Amyn8JRi18GKgM1z/
BBzmOldG2oeFUlFes5ADdVm0b3p+iiQ5WqzIJvLkBeV1HrLAQ2/zAl6ixpUwP2wr
sZymWkCXUUG2ZYn7ZxX6SXKvfvSv+GKUD0ImX82Q1DvAcQHSyiZ9/o9/pZbS4m1t
innS1EXJEEZHd1x61EBu2WrQkNwXvlpTDZNa7at9Lc5Uys6NsgfUkx4+fTyqDT8h
FfnxGaP9qHJRImVpxdBHsZGvUheDTVPPUk3eNNyeR1wmEz/OPCQmPIPIz0sw1TJt
LL0d4XN1rLjRSUGv+q1+Y6nbc85eU7nyJG/qB35Fag4z27x3P7D/4queR1hAij37
xp6MesrmEHPA7I4xV9jTzCRvY+O5MAughhOJMzZrn2f95EpC3Mg48OHdYRtktc1b
4L9Vb/HeQ6s0hgVZhkdNfoBPsi797YNCd5WNccKpAdq17mG5s6+6qJxBgCqgHS/i
4gjeR2IgSOL0KW2eE7STn8fgyY86ZepNsONkX6I+7n1h0lC7gVH6VtW5fzyvg9Bw
RLA5ulOqUc+f8Ll7MwzbRL3+wiNN4jkX5NHYpaQB2nWVEO9A+cs=
=76oN
-----END PGP SIGNATURE-----
Jussi Kivilinna (1):
batman-adv: bla: use netif_rx_ni when not in interrupt context
Linus L��ssing (4):
batman-adv: Fix own OGM check in aggregated OGMs
batman-adv: bla: fix type misuse for backbone_gw hash indexing
batman-adv: mcast/TT: fix wrongly dropped or rerouted packets
batman-adv: mcast: fix duplicate mcast packets in BLA backbone from mesh
Sven Eckelmann (2):
batman-adv: Avoid uninitialized chaddr when handling DHCP
batman-adv: Add missing include for in_interrupt()
-----------------------------------------------------------------------
--
linux integration
1 week, 5 days
[linux-merge]linux integration; annotated tag, v4.19.150, created. v4.19.150
by postmaster＠open-mesh.org
The annotated tag, v4.19.150 has been created
at 94bfb316efba249e57c280474695c020d4697cdd (tag)
tagging a1b977b49b66c75e6c51a515f6700371ae720217 (commit)
replaces v4.19.139
tagged by Greg Kroah-Hartman
on Wed Oct 7 08:00:42 2020 +0200
- Shortlog ------------------------------------------------------------
This is the 4.19.150 stable release
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAl99WYoACgkQONu9yGCS
aT75hA/+Lu0udzlCD/Uw1SDFKPo3Xed6hFiFUOHHtQxVel9r3DNOX1+kfNAH5ifo
G2NW6O25Bl4qxmG02QRW85r7JRHhoMQOx1DldLGlJCfcgmVcwEaiRg6HgMh+9OiC
qPAuE6zbB5h97dPQppe5u7e6pzjrsTgR6pYlnuwPVF6TSmTYXM3OGubXItOyneRZ
ePnzH9w4bk/n4UAARYOowfFhRnO/Qml+QPxc8rFbK2inGXCJ31QLITJCa3Y3KXP3
AC2aM2M8B04GJBFhXH8pLFrzvB/+S1DwzmtT3d6TWdQRqdSr+GAPJ/3jX2eKMuwK
6vfF/caGvfYpomEFCHFKyLxmFwhbSEfVD0ht4jr3aiF/E0ii8sXKN8mnnowpNFpG
23kG+baxxe1ZbjXw4VjtGGXruJQ6im5o7siRnmfKYv18Fo5O3yEga9pCjOdkHT20
gjes0GfTtgr3nrlW19B03ZYL7p3ri46NlY7Zlawvtz3dlWY9rTkII3nxD5k5Ywxs
KgDVpREwr7LuKOgGTxkwLGHNEF7b1mJrjdrlX/X2SDJD/IQc3xdD5382lXSQRaem
QaZhu6S6SNCjI9fGQ7jOYMR3ouGegFsPOnr6BQxvKmoolsUzXTeTxR0u2R5dqYGI
1RwmuTIQTvURoFy1XyhNyLJAbCvk+9BeNp8I5/YTNbvkFKlnawM=
=qKZh
-----END PGP SIGNATURE-----
Jussi Kivilinna (1):
batman-adv: bla: use netif_rx_ni when not in interrupt context
Linus L��ssing (5):
batman-adv: Fix own OGM check in aggregated OGMs
batman-adv: bla: fix type misuse for backbone_gw hash indexing
batman-adv: mcast/TT: fix wrongly dropped or rerouted packets
batman-adv: mcast: fix duplicate mcast packets in BLA backbone from mesh
batman-adv: mcast: fix duplicate mcast packets from BLA backbone to mesh
Sven Eckelmann (2):
batman-adv: Avoid uninitialized chaddr when handling DHCP
batman-adv: Add missing include for in_interrupt()
-----------------------------------------------------------------------
--
linux integration
1 week, 5 days
[linux-merge]linux integration; annotated tag, v5.4.70, created. v5.4.70
by postmaster＠open-mesh.org
The annotated tag, v5.4.70 has been created
at f5ee64f2dc4aa43cb31e71992fdfcfa05e67447a (tag)
tagging d22f99d235e13356521b374410a6ee24f50b65e6 (commit)
replaces v5.4.58
tagged by Greg Kroah-Hartman
on Wed Oct 7 08:02:03 2020 +0200
- Shortlog ------------------------------------------------------------
This is the 5.4.70 stable release
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAl99WdwACgkQONu9yGCS
aT4X0hAAiyB6vsAHKTdVF+lDc2phpblY7ryi/Pe56X3ie+aqZqd/SjVQ4MhZ4lO1
p4JjUjHPByHon2DrMlvE4cVf45LF1qpu2qrGkes/WaLX4OgeAsWPq/i31aks4S7h
JebCkX9UeVTLZMZ1beeqfRgsWUX75P8vhafyl5eLC5dJXzzL3G4V9Kz+LUKBuuHU
FoEmJHab2olfk1G2wgb9xOlmkeKt1xLBbfW8grv5c4zWQexiXJc+6M8CsQVdErLe
eK0XDbBcUMNpcCKFRyJ1NO/Y94Yui0YPQQziSHuSR+E+1PDd9roI+DbgInC82R9t
aO0XTnt+9mqxpuYZNHhwa/KHOg/rv/t2Y4GFySOUwaOBGtGRWVRgJfH1AoZu+rdk
OWamt8c5Uej8CpPtoXVLNblmnpPKavUd6dox8CyDGN/PPEsk0VoXvENZMjXaAA9Q
L0AaKdHnk+JK5HCou5vuw1AhoItB/jbldU7qy7cprZXDS7tEuGXVldRJkU5yVWyI
Z4/+ldQOAGSrgvEZz6DxxpQ/RJO1+ai/pJJXXcRu5JghlgnZHrrg1i2/EEMnCNy+
Kd/aXReVwiVX6wozrkOyeyymQaLe8wYeFWrc6vx0Z0L5cw7LVV7Oc0WflRXO0rq8
WN4qmmmL6URFwcVhHlaG8AHlaMfD/yawyb7bRIbxXwt2lHe5G1k=
=JxXq
-----END PGP SIGNATURE-----
Jussi Kivilinna (1):
batman-adv: bla: use netif_rx_ni when not in interrupt context
Linus L��ssing (6):
batman-adv: Fix own OGM check in aggregated OGMs
batman-adv: bla: fix type misuse for backbone_gw hash indexing
batman-adv: mcast/TT: fix wrongly dropped or rerouted packets
batman-adv: mcast: fix duplicate mcast packets in BLA backbone from LAN
batman-adv: mcast: fix duplicate mcast packets in BLA backbone from mesh
batman-adv: mcast: fix duplicate mcast packets from BLA backbone to mesh
Sven Eckelmann (2):
batman-adv: Avoid uninitialized chaddr when handling DHCP
batman-adv: Add missing include for in_interrupt()
-----------------------------------------------------------------------
--
linux integration
1 week, 5 days
[linux-merge]linux integration; annotated tag, v5.8.14, created. v5.8.14
by postmaster＠open-mesh.org
The annotated tag, v5.8.14 has been created
at 981d42383724ed667f16e7fb2f5f1cd8a6db5dc5 (tag)
tagging 70b225d0a8ca1242e8a75ded86b806070ec71b2f (commit)
replaces v5.8.1
tagged by Greg Kroah-Hartman
on Wed Oct 7 08:03:43 2020 +0200
- Shortlog ------------------------------------------------------------
This is the 5.8.14 stable release
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAl99Wj8ACgkQONu9yGCS
aT4fRA/8DyED9Rhgi2Kp3e/CBkR+cJyQFleFzdtxfPFeNHnMitvHvo2RMSWLt8MS
DH5GefimfBgMmnQ7060WmxDMMBPiakMBRqY0Yh8aNTxWNPhr0fPDpuPojIzbUxyL
FWmZ5AcGvhGdhABERgpMImU7oBwsg/9+Tf+3EN8grdkaWhctj5FjfHtHK5/FKrdL
LOy6xS5m3zvxOg378cR+YsGCZ3Lk6fooIt4QDmjLL4f4Nl0ihARm9E27Xq0SAhZ0
wlsM4SAOLVYZe38+D17ERVesn1COQeT6mkyQRwEOcN+93uejXDkfYbjm64uj3m/L
g6rTQwmgIlA7zdjPMcB7k/bl2VJDxfWPmv1cc6CgCrGXsbU8qmpyv8yJT0mBm/qp
mF0EIpLYEy7NSXuRTNdM8N7CByJCq/9oJYL9CfzGPHUxR00ysM20iNNXuEmmpUFw
wokwiEocsb6VCLjW2ol0JycqLRhZq9tjE/8z2LRbHFKUybC+6bR/Gk3w9oFL9nb7
XHVG+fpXR32pc0wjww85Oi5jPfGf+RpBqATfA38buRvbKsE7SSXVDII/7fOA47RE
rLxPtR4BVTazMmsj7TiedCQ29wnnRlDFP1it+Lu5pXL47NHNFm5BrLaFSB4w96zh
mGABR04kCdd2q4qCte0EeqWEfgizNS6Wwh7kdkfEI9wKrqVfx2s=
=Jx3n
-----END PGP SIGNATURE-----
Jussi Kivilinna (1):
batman-adv: bla: use netif_rx_ni when not in interrupt context
Linus L��ssing (6):
batman-adv: Fix own OGM check in aggregated OGMs
batman-adv: bla: fix type misuse for backbone_gw hash indexing
batman-adv: mcast/TT: fix wrongly dropped or rerouted packets
batman-adv: mcast: fix duplicate mcast packets in BLA backbone from LAN
batman-adv: mcast: fix duplicate mcast packets in BLA backbone from mesh
batman-adv: mcast: fix duplicate mcast packets from BLA backbone to mesh
Sven Eckelmann (2):
batman-adv: Avoid uninitialized chaddr when handling DHCP
batman-adv: Add missing include for in_interrupt()
-----------------------------------------------------------------------
--
linux integration
1 week, 5 days
[linux-merge]linux integration; annotated tag, v5.9, created. v5.9
by postmaster＠open-mesh.org
The annotated tag, v5.9 has been created
at 0ed79c602730cb0e73f78dcd503aca452f0d414b (tag)
tagging bbf5c979011a099af5dc76498918ed7df445635b (commit)
replaces v5.9-rc8
tagged by Linus Torvalds
on Sun Oct 11 14:15:50 2020 -0700
- Shortlog ------------------------------------------------------------
Linux 5.9
-----BEGIN PGP SIGNATURE-----
iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAl+DdgYeHHRvcnZhbGRz
QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGB1sH/0B4REolPPxiQsPL
P45+a2POUU0SQK8NjkcYskQmJ6DnPKkJSXeUU8rzuI2rty5bWEzEBxdUSh064ZaM
DGxkWrdhYNaLJuceNLlanBk3vrM3KwGkaJFSKLgsEXkmH86gl33ptA8nlQVbfc+4
FK4hRZs2J6Y5YRsuzPO8nzzHWs1CThZEcwNPOeIZrAnv+/13zyP/piZ+R/2gKYwy
RVrVrzSTkTGJXotn6J17Sa02+CGv5UqdxOZFv7jimYJOmFT7KnGngNrJbh8aYWk7
vPTRUvGozh6NyYxtRI9LKGZy1yQ05Cl7N927CnFYzD235/eT7zaRDZe1e1JaIE8Z
r2yxGCM=
=ZIYP
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
1 week, 6 days
[batman-adv] master: batman-adv: genetlink: move to smaller ops wherever possible (725b4ef5)
by postmaster＠open-mesh.org
Repository : ssh://git@diktynna/batman-adv
On branch : master
>---------------------------------------------------------------
commit 725b4ef5be840cfcd0ca33b9393c14dee40c10f7
Author: Jakub Kicinski <kuba(a)kernel.org>
Date: Thu Oct 8 20:16:12 2020 +0200
batman-adv: genetlink: move to smaller ops wherever possible
Bulk of the genetlink users can use smaller ops, move them.
Signed-off-by: Jakub Kicinski <kuba(a)kernel.org>
Reviewed-by: Johannes Berg <johannes(a)sipsolutions.net>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
[sven(a)narfation.org: Add compat code]
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
725b4ef5be840cfcd0ca33b9393c14dee40c10f7
compat-include/net/genetlink.h | 38 ++++++++++++++++++++++++--------------
net/batman-adv/netlink.c | 6 +++---
2 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/compat-include/net/genetlink.h b/compat-include/net/genetlink.h
index d1f80cd8..f16355fe 100644
--- a/compat-include/net/genetlink.h
+++ b/compat-include/net/genetlink.h
@@ -31,15 +31,17 @@ void batadv_genl_dump_check_consistent(struct netlink_callback *cb,
#endif /* LINUX_VERSION_IS_LESS(4, 15, 0) */
-#if LINUX_VERSION_IS_LESS(5, 2, 0)
+#if LINUX_VERSION_IS_LESS(5, 10, 0)
+#if LINUX_VERSION_IS_LESS(5, 2, 0)
enum genl_validate_flags {
GENL_DONT_VALIDATE_STRICT = BIT(0),
GENL_DONT_VALIDATE_DUMP = BIT(1),
GENL_DONT_VALIDATE_DUMP_STRICT = BIT(2),
};
+#endif /* LINUX_VERSION_IS_LESS(5, 2, 0) */
-struct batadv_genl_ops {
+struct batadv_genl_small_ops {
int (*doit)(struct sk_buff *skb,
struct genl_info *info);
int (*dumpit)(struct sk_buff *skb,
@@ -68,9 +70,9 @@ struct batadv_genl_family {
struct genl_info *info);
void (*post_doit)(const struct genl_ops *ops, struct sk_buff *skb,
struct genl_info *info);
- const struct batadv_genl_ops *ops;
+ const struct batadv_genl_small_ops *small_ops;
const struct genl_multicast_group *mcgrps;
- unsigned int n_ops;
+ unsigned int n_small_ops;
unsigned int n_mcgrps;
struct module *module;
@@ -94,24 +96,32 @@ static inline int batadv_genl_register_family(struct batadv_genl_family *family)
family->family.pre_doit = family->pre_doit;
family->family.post_doit = family->post_doit;
family->family.mcgrps = family->mcgrps;
- family->family.n_ops = family->n_ops;
+ family->family.n_ops = family->n_small_ops;
family->family.n_mcgrps = family->n_mcgrps;
family->family.module = family->module;
- ops = kzalloc(sizeof(*ops) * family->n_ops, GFP_KERNEL);
+ ops = kzalloc(sizeof(*ops) * family->n_small_ops, GFP_KERNEL);
if (!ops)
return -ENOMEM;
for (i = 0; i < family->family.n_ops; i++) {
- ops[i].doit = family->ops[i].doit;
- ops[i].dumpit = family->ops[i].dumpit;
- ops[i].done = family->ops[i].done;
- ops[i].cmd = family->ops[i].cmd;
- ops[i].internal_flags = family->ops[i].internal_flags;
- ops[i].flags = family->ops[i].flags;
+ ops[i].doit = family->small_ops[i].doit;
+ ops[i].dumpit = family->small_ops[i].dumpit;
+ ops[i].done = family->small_ops[i].done;
+ ops[i].cmd = family->small_ops[i].cmd;
+ ops[i].internal_flags = family->small_ops[i].internal_flags;
+ ops[i].flags = family->small_ops[i].flags;
+#if LINUX_VERSION_IS_GEQ(5, 2, 0)
+ ops[i].validate = family->small_ops[i].validate;
+#else
ops[i].policy = family->policy;
+#endif
}
+#if LINUX_VERSION_IS_GEQ(5, 2, 0)
+ family->family.policy = family->policy;
+#endif
+
family->family.ops = ops;
family->copy_ops = ops;
@@ -126,7 +136,7 @@ typedef struct genl_ops batadv_genl_ops_old;
#define batadv_post_doit(__x, __y, __z) \
batadv_post_doit(const batadv_genl_ops_old *ops, __y, __z)
-#define genl_ops batadv_genl_ops
+#define genl_small_ops batadv_genl_small_ops
#define genl_family batadv_genl_family
#define genl_register_family(family) \
@@ -150,6 +160,6 @@ batadv_genl_unregister_family(struct batadv_genl_family *family)
genlmsg_multicast_netns(&(_family)->family, _net, _skb, _portid, \
_group, _flags)
-#endif /* LINUX_VERSION_IS_LESS(5, 2, 0) */
+#endif /* LINUX_VERSION_IS_LESS(5, 10, 0) */
#endif /* _NET_BATMAN_ADV_COMPAT_NET_GENETLINK_H_ */
diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c
index dc193618..c7a55647 100644
--- a/net/batman-adv/netlink.c
+++ b/net/batman-adv/netlink.c
@@ -1350,7 +1350,7 @@ static void batadv_post_doit(const struct genl_ops *ops, struct sk_buff *skb,
}
}
-static const struct genl_ops batadv_netlink_ops[] = {
+static const struct genl_small_ops batadv_netlink_ops[] = {
{
.cmd = BATADV_CMD_GET_MESH,
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
@@ -1484,8 +1484,8 @@ struct genl_family batadv_netlink_family __ro_after_init = {
.pre_doit = batadv_pre_doit,
.post_doit = batadv_post_doit,
.module = THIS_MODULE,
- .ops = batadv_netlink_ops,
- .n_ops = ARRAY_SIZE(batadv_netlink_ops),
+ .small_ops = batadv_netlink_ops,
+ .n_small_ops = ARRAY_SIZE(batadv_netlink_ops),
.mcgrps = batadv_netlink_mcgrps,
.n_mcgrps = ARRAY_SIZE(batadv_netlink_mcgrps),
};
2 weeks
[linux-merge]linux integration; annotated tag, v5.9-rc8, created. v5.9-rc8
by postmaster＠open-mesh.org
The annotated tag, v5.9-rc8 has been created
at 11c2a51a0844833eee4356f86cf4555eafaf010b (tag)
tagging 549738f15da0e5a00275977623be199fbbf7df50 (commit)
replaces v5.9-rc7
tagged by Linus Torvalds
on Sun Oct 4 16:04:34 2020 -0700
- Shortlog ------------------------------------------------------------
Linux 5.9-rc8
-----BEGIN PGP SIGNATURE-----
iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAl96VQIeHHRvcnZhbGRz
QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGDS0H/0cyFcn/c8PYitdj
C5p8/1KUmXOJsHeRjZ6rZPExVL4bp88/xxMkzLspD6INJsoqfyrj1wbJfHIrYSYt
6Ps5NoWl9woJlyD4H7cyoXmGfb0DiVRjCWU7VK7fwxQy4W97A/eLgNEj1WMZ5kzC
FWT4bI7Kwo7tdcBeU52RkzZfeW59HU8667CO3FXr8yPySlUSZMoWeypQfCbHnqVG
WOEAJbbxklPzUbABcTF23lUMl1saOZ30T+hlXddolHq4clvhKf2b3lLbTCUcM1Yj
P+I7/K3bDdbpmaYNqNs8LCEiVhZBGK7CJViJvWAus/U7ccMNlJO4xJQV5C7oq85K
DSXVIYU=
=RqRn
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
2 weeks, 5 days