commits January 2020

commits@lists.open-mesh.org

1 participants
24 discussions

[linux-merge]linux integration; annotated tag, v5.4.15, created. v5.4.15

by postmaster＠open-mesh.org

The annotated tag, v5.4.15 has been created at 1fc888264c16696efac2751cfb470c8bd773d9e8 (tag) tagging 111e415c94f5c299de1ee50c825b60e63d5919e9 (commit) replaces v5.4 tagged by Greg Kroah-Hartman on Sun Jan 26 10:01:11 2020 +0100 - Shortlog ------------------------------------------------------------ This is the 5.4.15 stable release -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAl4tVVcACgkQONu9yGCS aT6IZQ/+J/hKVxK9S0E4nfHy8IC87wRnjmIBsjnZ8jx9+KAhYyHsL5iUL5U0YQPj O1ZYO2Yly8DzzU1RLwkMgZ+eGYBnNuSGtZN/v9IQrQYrV77F7fNM0S59f/ucQJLh lAMbaAbttR05bb48YieZm1HksoRsHmFEg0LsUbQqjm74CWJ+/JA+bZcdnTi9iiJm HELavBOM5NoO/g8Iuh0Xn5Y3W1mOTv3lG7Vn51TynUtJjlyJaaO9cVxDJzDBLabO SKYqH5X2yCBmKw3rH6F4KTDXAiM+v+EzvDwM12aEvG0TkkPEwNcFrkA4hgDFXUWi QEe24R/UP4J2W/jAH46VaeEELo0cNLzt0e9sVi6BsxtkTaf/KknxE93PSOyY40TF CM/nMJAlVv5KYmhQYPa9ZTEoUBNGcAVjsI2Pi7t86oLsFtaN6Sb1BvJTdHPwLA5Z OIi64ZBLy3jWHC4We3ajXI+PD6qlbzyTrjAE6Se5Zfmy05m936XNAfMup4mFMoBv MDEAG0f5XyyAXwARugq46xTlfjI1QO6XOnufxzFCaFETbtr+yYvmdmzWE1I+qyst Xugd94gchuWVH62YPbf+r9H2FpoHZjAroQHTV3hJ+pt/tJqYCcvISG2uv2pJePvm oRt/DO9CA2N5ls0z7WC55Kk746E5NSgsLmF4nktphnshqZR5VFs= =iz+j -----END PGP SIGNATURE----- Sven Eckelmann (1): batman-adv: Fix DAT candidate selection on little endian systems ----------------------------------------------------------------------- -- linux integration

3 years, 2 months

[linux-merge]linux integration; annotated tag, v3.16.81, created. v3.16.81

by postmaster＠open-mesh.org

The annotated tag, v3.16.81 has been created at 2e79543b34cb4581148214053d8310f6a2f2151a (tag) tagging 96c609c50beac276b773ed3427c3aa8558ba3a35 (commit) replaces v3.16.78 tagged by Ben Hutchings on Sat Jan 11 02:11:07 2020 +0000 - Shortlog ------------------------------------------------------------ This is the 3.16.81 stable release -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEErCspvTSmr92z9o8157/I7JWGEQkFAl4ZLrsACgkQ57/I7JWG EQn6fg/+IIIr6Za2GFIyPtBx/gqFHaO/SMfkwoGw63SRuI1XMQHCOPqR77HiYDoO BBlZ4fdzW/Qvoon/p4OjLjir7iIod2nwLewi5kkw6CzClYtfjafAopjNnSuwP7m5 +tf7nnHKLPb1MDMKujulp8rrfy9zufDr7+4Butzcr80elD5P3SAtmRoIU6M7k5Zl T8OjNCrLrOEL0TR1OdDQ7/ivfjD3dry9Z2DTL71ab9ynTbmqSvP7Tv1n3qYdYlGr D8CJUZtNQNN7r3y5CA4/KalUDyhBQ/OUZk8DFQkc+s7L38t11DRqwlBlog9XxUjp jxYoYUavQl4p+ztNsR5knlVFx5f9JIp4PWQv60KZ1+bE+ByVDAN0bc51FCgINTpH WwUoHOI5l2kxeOigg8dwYt3rOHQz5r6pQKeu0m4BUTihapsi1h2FHsfpWplP9x39 USI87NKxr63sOexHRH+I/Hot27dTkqUjMiHFuD7QBPPkCU8rAJDAZgM2VaZ779u0 ybAN+RW4NqdMOCokXfsAUWsFZC288ZC3oDKpoPQSHBMBX3k4onzcZ0HHYMG9k2Bq zmst6jBarMTwQ7hmS4VFfeP0GZJ4TwoBPTb0n6KZB+bYKhAzhdE+ZwUtngsut0pX vc/8hUAmX8q4k5AV4mY9Hsa3qaOnrLhZTItd7GxYOykii5tIKTU= =50Gf -----END PGP SIGNATURE----- Markus Pargmann (1): batman-adv: iv_ogm_iface_enable, direct return values Sven Eckelmann (1): batman-adv: Avoid free/alloc race when handling OGM buffer ----------------------------------------------------------------------- -- linux integration

3 years, 2 months

[linux-merge]linux integration; annotated tag, v4.4.211, created. v4.4.211

by postmaster＠open-mesh.org

The annotated tag, v4.4.211 has been created at fbe661cea68299b3c41a5d1b220fb11cdb32f9c5 (tag) tagging 4a070f3c06a103066c3155bd1ed3100aebea1a78 (commit) replaces v4.4.202 tagged by Greg Kroah-Hartman on Thu Jan 23 08:18:43 2020 +0100 - Shortlog ------------------------------------------------------------ This is the 4.4.211 stable release -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAl4pSNMACgkQONu9yGCS aT4gTQ//Qq1Hr6zQtqW0OCX0OmSB9AFd1KsOSXFyQz3ODQ/nzN7QAVdK6I51fTTV kA1IefGDD88lyP1OZmsQJZZmo9CZliSIYXa8H+stYjP6N6MFYWmpiXEtn0TdUwOl b1BNGLsA5QW3WwIssam+Z0sjr7yAcPakndx20p+Eqnu0MimYOrULefaXlCQ2vvgY 6/cN7nzGaXRiYiQMkInd2AqfP6hNz3Ys5pBDOtsfgMfFq5ziQACmtwJNEHmcTTOc uy1lK3saxmFRXNolYAwny5OqFgW92EBjF7TZDmcbMhS1z9W/KZL1WDqOpbup+t54 ifr9BuSH0NmqywRZyGtM5X+kF6Q2yaiuf/CXx+D6jh7eL4brOUzhVd8AxXW2Jt70 /iOZxx09oeehk+qrhh/KWY+Y297F07C7W3G3TJb0LdXEntjp54cxaETfYjiDVagL hi2pth9nr7HbVISsWQTbDOW9pRnxdv/jQChkPQgGXuFaa3GieqGbFQGMwiqwSNh0 APzbegE2KOvgMjrcnxgSrXmWL5t9jRx6mj0q/PsDBE+lo0FD9UbDrp07lQmRusF8 +rQBxowU0mWVJjtihZP4WDB/gbnGlpZ7VsoeQMh1j8CnQq1iKxunGynsYYuoh6y/ iQ9Hd3x0uiHyb2ltd82yBGr5616/d7J112BCNOrbFoMoDitfXbU= =taLu -----END PGP SIGNATURE----- Sven Eckelmann (1): batman-adv: Fix DAT candidate selection on little endian systems ----------------------------------------------------------------------- -- linux integration

3 years, 2 months

[linux-merge]linux integration; annotated tag, v4.9.211, created. v4.9.211

by postmaster＠open-mesh.org

The annotated tag, v4.9.211 has been created at 35de5f816eb2da337043f4b23b232847abc25c7b (tag) tagging 80f0831c72d498fb27c90de47e0f69d593000305 (commit) replaces v4.9.202 tagged by Greg Kroah-Hartman on Thu Jan 23 08:19:43 2020 +0100 - Shortlog ------------------------------------------------------------ This is the 4.9.211 stable release -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAl4pSQ8ACgkQONu9yGCS aT7byBAA1Sx2dkXj107MHQ/XQUQjn9LeDoUtdB105780XXRJqS1L6Bsm5pvsiOvQ GvkKpCHCWg12iuEKJCQ1pr88XKQrik68vRUOCgMt4rh0TovM8eUz9fuvFGO+u330 tCyW9zftkKNMYJmPSn2w6hOZcDK4wxgVjP6hkFgQJjyjFy/dbkcwFb6Vg9cfMRKc kkuacR9Hm7hG4V2RWD1pNsI4Nlly/oPXEmLJMplVGY+YyOAB5ne14JCevVX22bV2 WD9EUihPCsyB41LF2FhX5jzWhyFKgt/9tyrl7VFjsEqmvvdS7S9YMD3RJ2alzQbo qT4Wph+xVT3JIdXuFZuAaHUfFKwnWR/6cHcMiejsv/A6B72aRaECSMSN8aCJSYit eV3L/LNoLaKcpdpJLKVAWSny1ZaLnYTxk0E3OilQz+ZzqRk/LDjnxQry5sem6oXt 3HJlo2cuvd2bQ0Jd5RDnGW6N8CLx4HIMwnnxEjJmOqpUog6zSnhSbsvzpkQ2IZVs 3pFj1eYMausbEfdLXrFuky0cLvswjcYKT6W+CcapGba6IaHDhSg5V2WkPOktwxMW BYnnzJptWXbbCt6de1ZwOyVpKdmmf/9hDG4egPVaCAs7/AOzE7P5+zIheiN9KqRw 3Fz+KNFB85oztp5Ds4gnd9xYa11uEzTSm+vVCKGVfymPEKvCQfU= =84H5 -----END PGP SIGNATURE----- Sven Eckelmann (1): batman-adv: Fix DAT candidate selection on little endian systems ----------------------------------------------------------------------- -- linux integration

3 years, 2 months

[linux-merge]linux integration; annotated tag, v4.14.168, created. v4.14.168

by postmaster＠open-mesh.org

The annotated tag, v4.14.168 has been created at 589944b33a521cec1021b2a1fdbae1fef30e9271 (tag) tagging 9a95f25269bd9257ab9fba7bb14355d50b5f39ec (commit) replaces v4.14.156 tagged by Greg Kroah-Hartman on Mon Jan 27 14:49:00 2020 +0100 - Shortlog ------------------------------------------------------------ This is the 4.14.168 stable release -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAl4u6kwACgkQONu9yGCS aT7ZVhAA0fWQvb1m4oDyWlRLY4yPYVqpvjre7S/MF5VoDV85SsSqQkCVP4dybmRd SgNK9OkFuhY8QkPf8YSb6aU2tPQpIlMN3FYkpieN43OIrzU/OMOPiH50TygioPBT oT9ihbXXmxv1oce1PDBF+tmJCjLq4Ppcxd5H5iHruwcRdP3ZGi+VXnyIcMcwK1ap 4zgDCGuI4fhkVWQPfP5Eh+57j65qvH6TjOAB94GvSMSOerW9gw9k7Vfw/tzGiktf 7Zw9GXMM1ky0MvpIhsAJScWXDgftOn599hWfKO+bdD0hnszl5fY0Ha21Y80f5HSg S2Sl3EArr2psAxmKg9XqKJ9MugZG5odyRXS9ukIGmgNws7adDZY73Z6PLDUHsXZH KsDwmgrGqSOkaGZyYuBTVeK5K/n7jVrZ4uPSZx/UnO1f68EOfVCJvoMzVzPZU2SS +H7FfH0RSaSt2Mdc9LzzZO2QJ5DMA4fA0GZtNq5YU1rGyHo3Nq3aPQf9E5OJpYk6 mpXnoe8dndgmduwxdJ8wJaVJ2/nIwEZy0Hw4n5igkOKo+pTV//CQFwD87oBK16mE +953pg7z71IEPfJYs0wlKsBj3R4JXy5zBcaNpJkWe+vWMrw0ixi6qGmf2NbmaRPP 7qlEh6r/SDnszuDn9QH90C4EqJOaaDrgI+E2dSFA2mJKhO5qcII= =KNGQ -----END PGP SIGNATURE----- Sven Eckelmann (1): batman-adv: Fix DAT candidate selection on little endian systems ----------------------------------------------------------------------- -- linux integration

3 years, 2 months

[linux-merge]linux integration; annotated tag, v4.19.99, created. v4.19.99

by postmaster＠open-mesh.org

The annotated tag, v4.19.99 has been created at 52740e88903511032d54692e7ad33e948fb06a4a (tag) tagging 88d6de67e390b6093f2c11189ad022988a9e2961 (commit) replaces v4.19.86 tagged by Greg Kroah-Hartman on Mon Jan 27 14:51:23 2020 +0100 - Shortlog ------------------------------------------------------------ This is the 4.19.99 stable release -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAl4u6tsACgkQONu9yGCS aT693A//TExeDRnNnf+2v4TJorylyRr17BMxk/Ie2L5E6d2n/RWodsrOThAPU9tx 5alNUkXCT8Jd31BUVnUoPoAQ4zSymSVi++XEf05wDeO0tQ982IESGaLmu9EC1uMF nnM5y4IdRYmFI1Zji4h5vRJckoYUlB6Mdg4BgMr4Q1KX7RkZYfe6bjs7DwM/uyMx jVXdFaQBD1H6F5W6A+GmgUZ36g9uNqzcBxxWwv5URj+q816NdI4bsxIJMF0v0WC+ S54fmpS07QWIYKKsQBUepeSgEF4ECESOE2VoF1ICcnfakdPnDBmNgyPJPSrLmVf+ itRUxoH1MewaOvoJrv+xsGBPmM29LcKH2oBmj5DR2Xstp7ACPs+OtXJEU9dUTDN4 NhaSts5fIp0f4Y5mMn508pDUwYDAWDt99ZJWdx6aK/TRyUsHBgpxBQDt37BE3U5W PCBnObNe2b2KDAsVXLjX5iDYoA0+usFreveMo8uEP+ohfh0ANvJlRkzedYw7NquI ZCcT+I1P9q8aa0528tR332VLrQeYg+kG6LVi2kAabmRA/VtEsT0w90MY/eo2vuTU WlPmbs2yerv2HTm050e6MOgBZfPh7wP/FpbjsSXufj7EDywlfxF+1hXdwfrpPJeN fN3g0kepeUp7+kLzO40FLam/z5ndjAUhyN2SBaPzGsXjMkZdETk= =zvlh -----END PGP SIGNATURE----- Sven Eckelmann (1): batman-adv: Fix DAT candidate selection on little endian systems ----------------------------------------------------------------------- -- linux integration

3 years, 2 months

[linux-merge]linux integration; annotated tag, v5.5, created. v5.5

by postmaster＠open-mesh.org

The annotated tag, v5.5 has been created at 4e3112a240ba9986cc3f67a6880da6529a955006 (tag) tagging d5226fa6dbae0569ee43ecfc08bdcd6770fc4755 (commit) replaces v5.5-rc7 tagged by Linus Torvalds on Sun Jan 26 16:23:17 2020 -0800 - Shortlog ------------------------------------------------------------ Linux 5.5 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAl4uLXUeHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGQnkH/2d9YiY07GSV1RBs mWuZurJzgxI7sDsvoZJwnrAT2VXNbfxDPZbOBYRUbNE6mq5H0lMvy9vG88iGqqsW NCyecuGULiwcClIx77WggsdEtAVNecfHZ9nnjVnGQAbFsALSknZCRH+zO7yBrKM8 Gn6LvXNM4uSYqiI1RoBVfVgEJW/K+AnIwmEX+XLWIY9UJqsQTMVYil3sYOXGr2vB czkklPXYXvqBpb/bOlg4cBsesWV//QmnkX7c0ZqKiI9QT2KPX+s8r25jf9spWoiv CS7j2hcDAuOG/y94Mvpj9/HB28AvXe3+FspCYmdL0c0cjjkOQSRNSFCNMpOhoK64 qxTPcN8= =/NaV -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

3 years, 2 months

[batman-adv] master: batman-adv: Provide backports-like kernel version helpers (a42eafc5)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit a42eafc55fd9a5d351822f7209e02975c1cf21cf Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Jan 25 19:58:32 2020 +0100 batman-adv: Provide backports-like kernel version helpers The backports.git provides internal helper function to simplify the comparison of the LINUX_VERSION_CODE against the current kernel version. Also add thes to the batman-adv private compat helpers to simplify these kind of checks. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- a42eafc55fd9a5d351822f7209e02975c1cf21cf compat-include/linux/average.h | 4 ++-- compat-include/linux/build_bug.h | 2 +- compat-include/linux/cache.h | 4 ++-- compat-include/linux/compiler.h | 8 ++++---- compat-include/linux/ethtool.h | 4 ++-- compat-include/linux/fs.h | 8 ++++---- compat-include/linux/if_bridge.h | 16 ++++++++-------- compat-include/linux/igmp.h | 6 +++--- compat-include/linux/list.h | 8 ++++---- compat-include/linux/netdevice.h | 22 +++++++++++----------- compat-include/linux/netlink.h | 4 ++-- compat-include/linux/nl80211.h | 4 ++-- compat-include/linux/seq_file.h | 4 ++-- compat-include/linux/skbuff.h | 20 ++++++++++---------- compat-include/linux/stddef.h | 4 ++-- compat-include/linux/string.h | 4 ++-- compat-include/linux/timer.h | 4 ++-- compat-include/linux/types.h | 4 ++-- compat-include/linux/uaccess.h | 4 ++-- compat-include/linux/version.h | 21 +++++++++++++++++++++ compat-include/net/addrconf.h | 6 +++--- compat-include/net/cfg80211.h | 18 +++++++++--------- compat-include/net/genetlink.h | 8 ++++---- compat-include/net/ip6_checksum.h | 4 ++-- compat-include/net/netlink.h | 4 ++-- compat-include/uapi/linux/eventpoll.h | 4 ++-- compat-include/uapi/linux/nl80211.h | 4 ++-- compat-sources/net/core/skbuff.c | 8 ++++---- compat-sources/net/ipv4/igmp.c | 4 ++-- compat-sources/net/ipv6/mcast_snoop.c | 4 ++-- compat.h | 18 +++++++++--------- 31 files changed, 129 insertions(+), 108 deletions(-) diff --git a/compat-include/linux/average.h b/compat-include/linux/average.h index 6e8ac3c4..046e9cb5 100644 --- a/compat-include/linux/average.h +++ b/compat-include/linux/average.h @@ -17,9 +17,9 @@ #include <linux/compiler.h> #include <linux/log2.h> -#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0) +#if LINUX_VERSION_IS_GEQ(4, 3, 0) #undef DECLARE_EWMA -#endif /* < KERNEL_VERSION(4, 3, 0) */ +#endif /* LINUX_VERSION_IS_LESS(4, 3, 0) */ /* * Exponentially weighted moving average (EWMA) diff --git a/compat-include/linux/build_bug.h b/compat-include/linux/build_bug.h index a372bced..5996d9e7 100644 --- a/compat-include/linux/build_bug.h +++ b/compat-include/linux/build_bug.h @@ -11,7 +11,7 @@ #define _NET_BATMAN_ADV_COMPAT_LINUX_BUILD_BUG_H_ #include <linux/version.h> -#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 13, 0) +#if LINUX_VERSION_IS_GEQ(4, 13, 0) #include_next <linux/build_bug.h> #else #include <linux/bug.h> diff --git a/compat-include/linux/cache.h b/compat-include/linux/cache.h index 366d2835..82547e5c 100644 --- a/compat-include/linux/cache.h +++ b/compat-include/linux/cache.h @@ -13,10 +13,10 @@ #include <linux/version.h> #include_next <linux/cache.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) +#if LINUX_VERSION_IS_LESS(4, 6, 0) #define __ro_after_init -#endif /* < KERNEL_VERSION(4, 6, 0) */ +#endif /* LINUX_VERSION_IS_LESS(4, 6, 0) */ #endif /* _NET_BATMAN_ADV_COMPAT_LINUX_CACHE_H */ diff --git a/compat-include/linux/compiler.h b/compat-include/linux/compiler.h index 758d544e..89ed2929 100644 --- a/compat-include/linux/compiler.h +++ b/compat-include/linux/compiler.h @@ -13,7 +13,7 @@ #include <linux/version.h> #include_next <linux/compiler.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0) +#if LINUX_VERSION_IS_LESS(3, 19, 0) #ifndef READ_ONCE #define READ_ONCE(x) ACCESS_ONCE(x) @@ -25,10 +25,10 @@ }) #endif -#endif /* < KERNEL_VERSION(3, 19, 0) */ +#endif /* LINUX_VERSION_IS_LESS(3, 19, 0) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0) +#if LINUX_VERSION_IS_LESS(5, 4, 0) #ifndef fallthrough #if __GNUC__ > 7 && !defined(__CHECKER__) @@ -38,6 +38,6 @@ #endif #endif -#endif /* < KERNEL_VERSION(5, 4, 0) */ +#endif /* LINUX_VERSION_IS_LESS(5, 4, 0) */ #endif /* _NET_BATMAN_ADV_COMPAT_LINUX_COMPILER_H_ */ diff --git a/compat-include/linux/ethtool.h b/compat-include/linux/ethtool.h index c472233d..18629acd 100644 --- a/compat-include/linux/ethtool.h +++ b/compat-include/linux/ethtool.h @@ -13,7 +13,7 @@ #include <linux/version.h> #include_next <linux/ethtool.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) +#if LINUX_VERSION_IS_LESS(4, 6, 0) #define ethtool_link_ksettings batadv_ethtool_link_ksettings @@ -48,6 +48,6 @@ batadv_ethtool_get_link_ksettings(struct net_device *dev, return 0; } -#endif /* < KERNEL_VERSION(4, 6, 0) */ +#endif /* LINUX_VERSION_IS_LESS(4, 6, 0) */ #endif /* _NET_BATMAN_ADV_COMPAT_LINUX_ETHTOOL_H_ */ diff --git a/compat-include/linux/fs.h b/compat-include/linux/fs.h index 1334eb17..6867e6d4 100644 --- a/compat-include/linux/fs.h +++ b/compat-include/linux/fs.h @@ -13,7 +13,7 @@ #include <linux/version.h> #include_next <linux/fs.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) +#if LINUX_VERSION_IS_LESS(4, 6, 0) static inline struct dentry *batadv_file_dentry(const struct file *file) { @@ -29,9 +29,9 @@ static inline struct dentry *batadv_file_dentry(const struct file *file) #define file_dentry batadv_file_dentry -#endif /* < KERNEL_VERSION(4, 6, 0) */ +#endif /* LINUX_VERSION_IS_LESS(4, 6, 0) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) +#if LINUX_VERSION_IS_LESS(5, 2, 0) static inline int batadv_stream_open(struct inode *inode, struct file *filp) { @@ -40,6 +40,6 @@ static inline int batadv_stream_open(struct inode *inode, struct file *filp) #define stream_open batadv_stream_open -#endif /* < KERNEL_VERSION(5, 2, 0) */ +#endif /* LINUX_VERSION_IS_LESS(5, 2, 0) */ #endif /* _NET_BATMAN_ADV_COMPAT_LINUX_FS_H_ */ diff --git a/compat-include/linux/if_bridge.h b/compat-include/linux/if_bridge.h index c4c4ff6c..8dfcef19 100644 --- a/compat-include/linux/if_bridge.h +++ b/compat-include/linux/if_bridge.h @@ -13,7 +13,7 @@ #include <linux/version.h> #include_next <linux/if_bridge.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 16, 0) +#if LINUX_VERSION_IS_LESS(3, 16, 0) struct br_ip { union { @@ -31,12 +31,12 @@ struct br_ip_list { struct br_ip addr; }; -#endif /* < KERNEL_VERSION(3, 16, 0) */ +#endif /* LINUX_VERSION_IS_LESS(3, 16, 0) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 16, 0) || \ +#if LINUX_VERSION_IS_LESS(3, 16, 0) || \ LINUX_VERSION_CODE == KERNEL_VERSION(3, 16, 0) && \ - (!IS_ENABLED(CONFIG_BRIDGE) || \ - !IS_ENABLED(CONFIG_BRIDGE_IGMP_SNOOPING)) + (!IS_ENABLED(CONFIG_BRIDGE) || \ + !IS_ENABLED(CONFIG_BRIDGE_IGMP_SNOOPING)) #define br_multicast_list_adjacent(dev, br_ip_list) \ batadv_br_multicast_list_adjacent(dev, br_ip_list) @@ -57,12 +57,12 @@ batadv_br_multicast_has_querier_adjacent(struct net_device *dev, int proto) return false; } -#endif /* < KERNEL_VERSION(3, 16, 0) || +#endif /* LINUX_VERSION_IS_LESS(3, 16, 0) || * == KERNEL_VERSION(3, 16, 0) && * (!IS_ENABLED(CONFIG_BRIDGE) || * !IS_ENABLED(CONFIG_BRIDGE_IGMP_SNOOPING)) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) +#if LINUX_VERSION_IS_LESS(3, 17, 0) static inline bool br_multicast_has_querier_anywhere(struct net_device *dev, int proto) @@ -72,6 +72,6 @@ static inline bool br_multicast_has_querier_anywhere(struct net_device *dev, return false; } -#endif /* < KERNEL_VERSION(3, 17, 0) */ +#endif /* LINUX_VERSION_IS_LESS(3, 17, 0) */ #endif /* _NET_BATMAN_ADV_COMPAT_LINUX_IF_BRIDGE_H_ */ diff --git a/compat-include/linux/igmp.h b/compat-include/linux/igmp.h index ecedc915..9875d6d4 100644 --- a/compat-include/linux/igmp.h +++ b/compat-include/linux/igmp.h @@ -13,11 +13,11 @@ #include <linux/version.h> #include_next <linux/igmp.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0) +#if LINUX_VERSION_IS_LESS(4, 2, 0) int ip_mc_check_igmp(struct sk_buff *skb); -#elif LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0) +#elif LINUX_VERSION_IS_LESS(5, 1, 0) static inline int batadv_ip_mc_check_igmp(struct sk_buff *skb) { @@ -27,6 +27,6 @@ static inline int batadv_ip_mc_check_igmp(struct sk_buff *skb) #define ip_mc_check_igmp(skb) \ batadv_ip_mc_check_igmp(skb) -#endif /* < KERNEL_VERSION(4, 2, 0) */ +#endif /* LINUX_VERSION_IS_LESS(4, 2, 0) */ #endif /* _NET_BATMAN_ADV_COMPAT_LINUX_IGMP_H_ */ diff --git a/compat-include/linux/list.h b/compat-include/linux/list.h index be02d75c..1bd85d0d 100644 --- a/compat-include/linux/list.h +++ b/compat-include/linux/list.h @@ -13,19 +13,19 @@ #include <linux/version.h> #include_next <linux/list.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) +#if LINUX_VERSION_IS_LESS(3, 17, 0) #define hlist_add_behind(n, prev) hlist_add_after(prev, n) -#endif /* < KERNEL_VERSION(3, 17, 0) */ +#endif /* LINUX_VERSION_IS_LESS(3, 17, 0) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0) +#if LINUX_VERSION_IS_LESS(4, 3, 0) static inline bool hlist_fake(struct hlist_node *h) { return h->pprev == &h->next; } -#endif /* < KERNEL_VERSION(4, 3, 0) */ +#endif /* LINUX_VERSION_IS_LESS(4, 3, 0) */ #endif /* _NET_BATMAN_ADV_COMPAT_LINUX_LIST_H_ */ diff --git a/compat-include/linux/netdevice.h b/compat-include/linux/netdevice.h index 55189640..ae7fb906 100644 --- a/compat-include/linux/netdevice.h +++ b/compat-include/linux/netdevice.h @@ -13,34 +13,34 @@ #include <linux/version.h> #include_next <linux/netdevice.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0) +#if LINUX_VERSION_IS_LESS(3, 17, 0) /* alloc_netdev() was defined differently before 2.6.38 */ #undef alloc_netdev #define alloc_netdev(sizeof_priv, name, name_assign_type, setup) \ alloc_netdev_mqs(sizeof_priv, name, setup, 1, 1) -#endif /* < KERNEL_VERSION(3, 17, 0) */ +#endif /* LINUX_VERSION_IS_LESS(3, 17, 0) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0) +#if LINUX_VERSION_IS_LESS(4, 1, 0) #define dev_get_iflink(_net_dev) ((_net_dev)->iflink) -#endif /* < KERNEL_VERSION(3, 19, 0) */ +#endif /* LINUX_VERSION_IS_LESS(3, 19, 0) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) +#if LINUX_VERSION_IS_LESS(4, 5, 0) #define netdev_master_upper_dev_link(dev, upper_dev, upper_priv, upper_info, extack) \ netdev_master_upper_dev_link(dev, upper_dev) -#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) +#elif LINUX_VERSION_IS_LESS(4, 15, 0) #define netdev_master_upper_dev_link(dev, upper_dev, upper_priv, upper_info, extack) \ netdev_master_upper_dev_link(dev, upper_dev, upper_priv, upper_info) -#endif /* < KERNEL_VERSION(4, 15, 0) */ +#endif /* LINUX_VERSION_IS_LESS(4, 15, 0) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0) +#if LINUX_VERSION_IS_LESS(4, 7, 0) #define netif_trans_update batadv_netif_trans_update static inline void batadv_netif_trans_update(struct net_device *dev) @@ -48,9 +48,9 @@ static inline void batadv_netif_trans_update(struct net_device *dev) dev->trans_start = jiffies; } -#endif /* < KERNEL_VERSION(4, 7, 0) */ +#endif /* LINUX_VERSION_IS_LESS(4, 7, 0) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 9) +#if LINUX_VERSION_IS_LESS(4, 11, 9) /* work around missing attribute needs_free_netdev and priv_destructor in * net_device @@ -67,6 +67,6 @@ static inline void batadv_netif_trans_update(struct net_device *dev) #define needs_free_netdev destructor = batadv_softif_free2; t2 #define priv_destructor destructor = batadv_softif_free2; t1 -#endif /* < KERNEL_VERSION(4, 11, 9) */ +#endif /* LINUX_VERSION_IS_LESS(4, 11, 9) */ #endif /* _NET_BATMAN_ADV_COMPAT_LINUX_NETDEVICE_H_ */ diff --git a/compat-include/linux/netlink.h b/compat-include/linux/netlink.h index b62e01e3..27dc6581 100644 --- a/compat-include/linux/netlink.h +++ b/compat-include/linux/netlink.h @@ -13,7 +13,7 @@ #include <linux/version.h> #include_next <linux/netlink.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0) +#if LINUX_VERSION_IS_LESS(4, 7, 0) #include_next <net/netlink.h> @@ -97,6 +97,6 @@ static inline int batadv_nla_put_u64_64bit(struct sk_buff *skb, int attrtype, padattr); } -#endif /* < KERNEL_VERSION(4, 7, 0) */ +#endif /* LINUX_VERSION_IS_LESS(4, 7, 0) */ #endif /* _NET_BATMAN_ADV_COMPAT_LINUX_NETLINK_H_ */ diff --git a/compat-include/linux/nl80211.h b/compat-include/linux/nl80211.h index d0fb9bb9..bea92d1b 100644 --- a/compat-include/linux/nl80211.h +++ b/compat-include/linux/nl80211.h @@ -13,11 +13,11 @@ #include <linux/version.h> #include_next <linux/nl80211.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 16, 0) +#if LINUX_VERSION_IS_LESS(3, 16, 0) /* Linux 3.15 misses the uapi include.... */ #include <uapi/linux/nl80211.h> -#endif /* < KERNEL_VERSION(3, 16, 0) */ +#endif /* LINUX_VERSION_IS_LESS(3, 16, 0) */ #endif /* _NET_BATMAN_ADV_COMPAT_LINUX_NL80211_H_ */ diff --git a/compat-include/linux/seq_file.h b/compat-include/linux/seq_file.h index 192897f4..74854f56 100644 --- a/compat-include/linux/seq_file.h +++ b/compat-include/linux/seq_file.h @@ -13,13 +13,13 @@ #include <linux/version.h> #include_next <linux/seq_file.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0) +#if LINUX_VERSION_IS_LESS(3, 19, 0) static inline bool seq_has_overflowed(struct seq_file *m) { return m->count == m->size; } -#endif /* < KERNEL_VERSION(3, 19, 0) */ +#endif /* LINUX_VERSION_IS_LESS(3, 19, 0) */ #endif /* _NET_BATMAN_ADV_COMPAT_LINUX_SEQ_FILE_H_ */ diff --git a/compat-include/linux/skbuff.h b/compat-include/linux/skbuff.h index 0fa77b99..e92f3422 100644 --- a/compat-include/linux/skbuff.h +++ b/compat-include/linux/skbuff.h @@ -13,7 +13,7 @@ #include <linux/version.h> #include_next <linux/skbuff.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 16, 0) +#if LINUX_VERSION_IS_LESS(3, 16, 0) #define pskb_copy_for_clone pskb_copy @@ -23,17 +23,17 @@ __sum16 skb_checksum_validate(struct sk_buff *skb, int proto, __wsum (*compute_pseudo)(struct sk_buff *skb, int proto)); -#endif /* < KERNEL_VERSION(3, 16, 0) */ +#endif /* LINUX_VERSION_IS_LESS(3, 16, 0) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0) +#if LINUX_VERSION_IS_LESS(4, 2, 0) struct sk_buff *skb_checksum_trimmed(struct sk_buff *skb, unsigned int transport_len, __sum16(*skb_chkf)(struct sk_buff *skb)); -#endif /* < KERNEL_VERSION(4, 2, 0) */ +#endif /* LINUX_VERSION_IS_LESS(4, 2, 0) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) +#if LINUX_VERSION_IS_LESS(4, 5, 0) static inline void batadv_skb_postpush_rcsum(struct sk_buff *skb, const void *start, @@ -46,9 +46,9 @@ static inline void batadv_skb_postpush_rcsum(struct sk_buff *skb, #define skb_postpush_rcsum batadv_skb_postpush_rcsum -#endif /* < KERNEL_VERSION(4, 5, 0) */ +#endif /* LINUX_VERSION_IS_LESS(4, 5, 0) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 13, 0) +#if LINUX_VERSION_IS_LESS(4, 13, 0) static inline void *batadv_skb_put(struct sk_buff *skb, unsigned int len) { @@ -75,12 +75,12 @@ static inline void *skb_put_data(struct sk_buff *skb, const void *data, return tmp; } -#endif /* < KERNEL_VERSION(4, 13, 0) */ +#endif /* LINUX_VERSION_IS_LESS(4, 13, 0) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0) +#if LINUX_VERSION_IS_LESS(5, 4, 0) #define nf_reset_ct nf_reset -#endif /* < KERNEL_VERSION(5, 4, 0) */ +#endif /* LINUX_VERSION_IS_LESS(5, 4, 0) */ #endif /* _NET_BATMAN_ADV_COMPAT_LINUX_SKBUFF_H_ */ diff --git a/compat-include/linux/stddef.h b/compat-include/linux/stddef.h index 67cd72f3..be4e31e9 100644 --- a/compat-include/linux/stddef.h +++ b/compat-include/linux/stddef.h @@ -13,12 +13,12 @@ #include <linux/version.h> #include_next <linux/stddef.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0) +#if LINUX_VERSION_IS_LESS(4, 16, 0) #ifndef sizeof_field #define sizeof_field(TYPE, MEMBER) sizeof((((TYPE *)0)->MEMBER)) #endif -#endif /* < KERNEL_VERSION(4, 16, 0) */ +#endif /* LINUX_VERSION_IS_LESS(4, 16, 0) */ #endif /* _NET_BATMAN_ADV_COMPAT_LINUX_STDDEF_H_ */ diff --git a/compat-include/linux/string.h b/compat-include/linux/string.h index 36ec689e..71978031 100644 --- a/compat-include/linux/string.h +++ b/compat-include/linux/string.h @@ -12,7 +12,7 @@ #include_next <linux/string.h> #include <asm-generic/errno-base.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0) +#if LINUX_VERSION_IS_LESS(4, 3, 0) #ifndef __HAVE_ARCH_STRSCPY @@ -46,6 +46,6 @@ static inline ssize_t batadv_strscpy(char *dest, const char *src, size_t count) #endif -#endif /* < KERNEL_VERSION(4, 3, 0) */ +#endif /* LINUX_VERSION_IS_LESS(4, 3, 0) */ #endif /* _NET_BATMAN_ADV_COMPAT_LINUX_STRING_H_ */ diff --git a/compat-include/linux/timer.h b/compat-include/linux/timer.h index 2968c255..8a4e714c 100644 --- a/compat-include/linux/timer.h +++ b/compat-include/linux/timer.h @@ -13,7 +13,7 @@ #include <linux/version.h> #include_next <linux/timer.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0) +#if LINUX_VERSION_IS_LESS(4, 14, 0) #define TIMER_DATA_TYPE unsigned long #define TIMER_FUNC_TYPE void (*)(TIMER_DATA_TYPE) @@ -29,6 +29,6 @@ static inline void timer_setup(struct timer_list *timer, #define from_timer(var, callback_timer, timer_fieldname) \ container_of(callback_timer, typeof(*var), timer_fieldname) -#endif /* < KERNEL_VERSION(4, 14, 0) */ +#endif /* LINUX_VERSION_IS_LESS(4, 14, 0) */ #endif /* _NET_BATMAN_ADV_COMPAT_LINUX_TIMER_H */ diff --git a/compat-include/linux/types.h b/compat-include/linux/types.h index 1c17893b..33562897 100644 --- a/compat-include/linux/types.h +++ b/compat-include/linux/types.h @@ -13,7 +13,7 @@ #include <linux/version.h> #include_next <linux/types.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 16, 0) +#if LINUX_VERSION_IS_LESS(4, 16, 0) #ifdef __CHECK_POLL typedef unsigned __bitwise __poll_t; @@ -21,6 +21,6 @@ typedef unsigned __bitwise __poll_t; typedef unsigned __poll_t; #endif -#endif /* < KERNEL_VERSION(4, 16, 0) */ +#endif /* LINUX_VERSION_IS_LESS(4, 16, 0) */ #endif /* _NET_BATMAN_ADV_COMPAT_LINUX_TYPES_H_ */ diff --git a/compat-include/linux/uaccess.h b/compat-include/linux/uaccess.h index e81ed805..b9b3a7cb 100644 --- a/compat-include/linux/uaccess.h +++ b/compat-include/linux/uaccess.h @@ -13,7 +13,7 @@ #include <linux/version.h> #include_next <linux/uaccess.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) +#if LINUX_VERSION_IS_LESS(5, 0, 0) static inline int batadv_access_ok(int type, const void __user *p, unsigned long size) @@ -32,6 +32,6 @@ static inline int batadv_access_ok(int type, const void __user *p, #define access_ok2(addr, size) batadv_access_ok(VERIFY_WRITE, (addr), (size)) #define access_ok3(type, addr, size) batadv_access_ok((type), (addr), (size)) -#endif /* < KERNEL_VERSION(5, 0, 0) */ +#endif /* LINUX_VERSION_IS_LESS(5, 0, 0) */ #endif /* _NET_BATMAN_ADV_COMPAT_LINUX_UACCESS_H_ */ diff --git a/compat-include/linux/version.h b/compat-include/linux/version.h new file mode 100644 index 00000000..5582e8cb --- /dev/null +++ b/compat-include/linux/version.h @@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 2007-2020 B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * This file contains macros for maintaining compatibility with older versions + * of the Linux kernel. + */ + +#ifndef _NET_BATMAN_ADV_COMPAT_LINUX_VERSION_H_ +#define _NET_BATMAN_ADV_COMPAT_LINUX_VERSION_H_ + +#include_next <linux/version.h> + +#define LINUX_VERSION_IS_LESS(a, b, c) \ + (LINUX_VERSION_CODE < KERNEL_VERSION(a, b, c)) + +#define LINUX_VERSION_IS_GEQ(a, b, c) \ + (LINUX_VERSION_CODE >= KERNEL_VERSION(a, b, c)) + +#endif /* _NET_BATMAN_ADV_COMPAT_LINUX_VERSION_H_ */ diff --git a/compat-include/net/addrconf.h b/compat-include/net/addrconf.h index b826ee95..5430811a 100644 --- a/compat-include/net/addrconf.h +++ b/compat-include/net/addrconf.h @@ -13,11 +13,11 @@ #include <linux/version.h> #include_next <net/addrconf.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0) +#if LINUX_VERSION_IS_LESS(4, 2, 0) int ipv6_mc_check_mld(struct sk_buff *skb); -#elif LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0) +#elif LINUX_VERSION_IS_LESS(5, 1, 0) static inline int batadv_ipv6_mc_check_mld(struct sk_buff *skb) { @@ -27,6 +27,6 @@ static inline int batadv_ipv6_mc_check_mld(struct sk_buff *skb) #define ipv6_mc_check_mld(skb) \ batadv_ipv6_mc_check_mld(skb) -#endif /* < KERNEL_VERSION(4, 2, 0) */ +#endif /* LINUX_VERSION_IS_LESS(4, 2, 0) */ #endif /* _NET_BATMAN_ADV_COMPAT_NET_ADDRCONF_H_ */ diff --git a/compat-include/net/cfg80211.h b/compat-include/net/cfg80211.h index b2f8dd73..241f44e0 100644 --- a/compat-include/net/cfg80211.h +++ b/compat-include/net/cfg80211.h @@ -13,7 +13,7 @@ #include <linux/version.h> #include_next <net/cfg80211.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 16, 0) +#if LINUX_VERSION_IS_LESS(3, 16, 0) static inline int cfg80211_get_station(struct net_device *dev, const u8 *mac_addr, @@ -29,13 +29,13 @@ static inline int cfg80211_get_station(struct net_device *dev, */ #define expected_throughput filled -#endif /* < KERNEL_VERSION(3, 16, 0) */ +#endif /* LINUX_VERSION_IS_LESS(3, 16, 0) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0) +#if LINUX_VERSION_IS_LESS(4, 8, 0) #if !IS_ENABLED(CONFIG_CFG80211) && \ - LINUX_VERSION_CODE >= KERNEL_VERSION(3, 16, 0) + LINUX_VERSION_IS_GEQ(3, 16, 0) #define cfg80211_get_station(dev, mac_addr, sinfo) \ batadv_cfg80211_get_station(dev, mac_addr, sinfo) @@ -48,10 +48,10 @@ static inline int batadv_cfg80211_get_station(struct net_device *dev, } #endif -#endif /* < KERNEL_VERSION(4, 8, 0) */ +#endif /* LINUX_VERSION_IS_LESS(4, 8, 0) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 18, 0) && IS_ENABLED(CONFIG_CFG80211) +#if LINUX_VERSION_IS_LESS(4, 18, 0) && IS_ENABLED(CONFIG_CFG80211) /* cfg80211 fix: https://patchwork.kernel.org/patch/10449857/ */ static inline int batadv_cfg80211_get_station(struct net_device *dev, @@ -65,13 +65,13 @@ static inline int batadv_cfg80211_get_station(struct net_device *dev, #define cfg80211_get_station(dev, mac_addr, sinfo) \ batadv_cfg80211_get_station(dev, mac_addr, sinfo) -#endif /* < KERNEL_VERSION(4, 18, 0) && IS_ENABLED(CONFIG_CFG80211) */ +#endif /* LINUX_VERSION_IS_LESS(4, 18, 0) && IS_ENABLED(CONFIG_CFG80211) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 18, 0) +#if LINUX_VERSION_IS_LESS(4, 18, 0) #define cfg80211_sinfo_release_content(sinfo) -#endif /* < KERNEL_VERSION(4, 18, 0) */ +#endif /* LINUX_VERSION_IS_LESS(4, 18, 0) */ #endif /* _NET_BATMAN_ADV_COMPAT_NET_CFG80211_H_ */ diff --git a/compat-include/net/genetlink.h b/compat-include/net/genetlink.h index d17fa82e..d1f80cd8 100644 --- a/compat-include/net/genetlink.h +++ b/compat-include/net/genetlink.h @@ -13,7 +13,7 @@ #include <linux/version.h> #include_next <net/genetlink.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) +#if LINUX_VERSION_IS_LESS(4, 15, 0) static inline void batadv_genl_dump_check_consistent(struct netlink_callback *cb, @@ -28,10 +28,10 @@ void batadv_genl_dump_check_consistent(struct netlink_callback *cb, #define genl_dump_check_consistent batadv_genl_dump_check_consistent -#endif /* < KERNEL_VERSION(4, 15, 0) */ +#endif /* LINUX_VERSION_IS_LESS(4, 15, 0) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) +#if LINUX_VERSION_IS_LESS(5, 2, 0) enum genl_validate_flags { GENL_DONT_VALIDATE_STRICT = BIT(0), @@ -150,6 +150,6 @@ batadv_genl_unregister_family(struct batadv_genl_family *family) genlmsg_multicast_netns(&(_family)->family, _net, _skb, _portid, \ _group, _flags) -#endif /* < KERNEL_VERSION(5, 2, 0) */ +#endif /* LINUX_VERSION_IS_LESS(5, 2, 0) */ #endif /* _NET_BATMAN_ADV_COMPAT_NET_GENETLINK_H_ */ diff --git a/compat-include/net/ip6_checksum.h b/compat-include/net/ip6_checksum.h index 0d9596a8..8997cbf9 100644 --- a/compat-include/net/ip6_checksum.h +++ b/compat-include/net/ip6_checksum.h @@ -13,7 +13,7 @@ #include <linux/version.h> #include_next <net/ip6_checksum.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 16, 0) +#if LINUX_VERSION_IS_LESS(3, 16, 0) static inline __wsum ip6_compute_pseudo(struct sk_buff *skb, int proto) { @@ -22,6 +22,6 @@ static inline __wsum ip6_compute_pseudo(struct sk_buff *skb, int proto) skb->len, proto, 0)); } -#endif /* < KERNEL_VERSION(3, 16, 0) */ +#endif /* LINUX_VERSION_IS_LESS(3, 16, 0) */ #endif /* _NET_BATMAN_ADV_COMPAT_NET_IP6_CHECKSUM_H_ */ diff --git a/compat-include/net/netlink.h b/compat-include/net/netlink.h index e98ea1e6..c7419e15 100644 --- a/compat-include/net/netlink.h +++ b/compat-include/net/netlink.h @@ -13,7 +13,7 @@ #include <linux/version.h> #include_next <net/netlink.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0) +#if LINUX_VERSION_IS_LESS(4, 1, 0) static inline int nla_put_in_addr(struct sk_buff *skb, int attrtype, __be32 addr) @@ -23,6 +23,6 @@ static inline int nla_put_in_addr(struct sk_buff *skb, int attrtype, return nla_put_be32(skb, attrtype, tmp); } -#endif /* < KERNEL_VERSION(4, 1, 0) */ +#endif /* LINUX_VERSION_IS_LESS(4, 1, 0) */ #endif /* _NET_BATMAN_ADV_COMPAT_NET_NETLINK_H_ */ diff --git a/compat-include/uapi/linux/eventpoll.h b/compat-include/uapi/linux/eventpoll.h index 7ec15069..40c57ed9 100644 --- a/compat-include/uapi/linux/eventpoll.h +++ b/compat-include/uapi/linux/eventpoll.h @@ -14,7 +14,7 @@ #include <linux/types.h> #include_next <uapi/linux/eventpoll.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 12, 0) +#if LINUX_VERSION_IS_LESS(4, 12, 0) #ifndef EPOLLIN #define EPOLLIN (__force __poll_t)0x00000001 @@ -24,6 +24,6 @@ #define EPOLLRDNORM (__force __poll_t)0x00000040 #endif -#endif /* < KERNEL_VERSION(4, 12, 0) */ +#endif /* LINUX_VERSION_IS_LESS(4, 12, 0) */ #endif /* _NET_BATMAN_ADV_COMPAT_UAPI_LINUX_EVENTPOLL_H_ */ diff --git a/compat-include/uapi/linux/nl80211.h b/compat-include/uapi/linux/nl80211.h index ac4f50c2..dff0dd5c 100644 --- a/compat-include/uapi/linux/nl80211.h +++ b/compat-include/uapi/linux/nl80211.h @@ -13,13 +13,13 @@ #include <linux/version.h> #include_next <uapi/linux/nl80211.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0) +#if LINUX_VERSION_IS_LESS(4, 0, 0) /* for batadv_v_elp_get_throughput which would have used * STATION_INFO_EXPECTED_THROUGHPUT in Linux 4.0.0 */ #define NL80211_STA_INFO_EXPECTED_THROUGHPUT 28 -#endif /* < KERNEL_VERSION(4, 0, 0) */ +#endif /* LINUX_VERSION_IS_LESS(4, 0, 0) */ #endif /* _NET_BATMAN_ADV_COMPAT_UAPI_LINUX_NL80211_H_ */ diff --git a/compat-sources/net/core/skbuff.c b/compat-sources/net/core/skbuff.c index 16ec56ef..fd2771ae 100644 --- a/compat-sources/net/core/skbuff.c +++ b/compat-sources/net/core/skbuff.c @@ -35,7 +35,7 @@ #include <net/checksum.h> #include <net/ip6_checksum.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 16, 0) +#if LINUX_VERSION_IS_LESS(3, 16, 0) /* Compare with: * "bridge: multicast: call skb_checksum_{simple_, }validate" @@ -84,9 +84,9 @@ skb_checksum_validate(struct sk_buff *skb, int proto, return 0; } -#endif /* < KERNEL_VERSION(3, 16, 0) */ +#endif /* LINUX_VERSION_IS_LESS(3, 16, 0) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0) +#if LINUX_VERSION_IS_LESS(4, 2, 0) /** * skb_push_rcsum - push skb and update receive checksum @@ -192,4 +192,4 @@ struct sk_buff *skb_checksum_trimmed(struct sk_buff *skb, return skb_chk; } -#endif /* < KERNEL_VERSION(4, 2, 0) */ +#endif /* LINUX_VERSION_IS_LESS(4, 2, 0) */ diff --git a/compat-sources/net/ipv4/igmp.c b/compat-sources/net/ipv4/igmp.c index 762818b4..6c639676 100644 --- a/compat-sources/net/ipv4/igmp.c +++ b/compat-sources/net/ipv4/igmp.c @@ -71,7 +71,7 @@ #include <linux/skbuff.h> #include <net/ip.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0) +#if LINUX_VERSION_IS_LESS(4, 2, 0) static int ip_mc_check_iphdr(struct sk_buff *skb) { @@ -220,4 +220,4 @@ int ip_mc_check_igmp(struct sk_buff *skb) return __ip_mc_check_igmp(skb); } -#endif /* < KERNEL_VERSION(4, 2, 0) */ +#endif /* LINUX_VERSION_IS_LESS(4, 2, 0) */ diff --git a/compat-sources/net/ipv6/mcast_snoop.c b/compat-sources/net/ipv6/mcast_snoop.c index 9ab2a1a2..651b8e3b 100644 --- a/compat-sources/net/ipv6/mcast_snoop.c +++ b/compat-sources/net/ipv6/mcast_snoop.c @@ -11,7 +11,7 @@ #include <net/addrconf.h> #include <net/ip6_checksum.h> -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 2, 0) +#if LINUX_VERSION_IS_LESS(4, 2, 0) static int ipv6_mc_check_ip6hdr(struct sk_buff *skb) { @@ -186,4 +186,4 @@ int ipv6_mc_check_mld(struct sk_buff *skb) return __ipv6_mc_check_mld(skb); } -#endif /* < KERNEL_VERSION(4, 2, 0) */ +#endif /* LINUX_VERSION_IS_LESS(4, 2, 0) */ diff --git a/compat.h b/compat.h index 980fca9f..b915d914 100644 --- a/compat.h +++ b/compat.h @@ -15,34 +15,34 @@ #include "compat-autoconf.h" -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 0, 0) +#if LINUX_VERSION_IS_LESS(4, 0, 0) /* wild hack for batadv_getlink_net only */ #define get_link_net get_xstats_size || 1 ? fallback_net : (struct net*)netdev->rtnl_link_ops->get_xstats_size -#endif /* < KERNEL_VERSION(4, 0, 0) */ +#endif /* LINUX_VERSION_IS_LESS(4, 0, 0) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0) +#if LINUX_VERSION_IS_LESS(4, 3, 0) #define IFF_NO_QUEUE 0; dev->tx_queue_len = 0 -#endif /* < KERNEL_VERSION(4, 3, 0) */ +#endif /* LINUX_VERSION_IS_LESS(4, 3, 0) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0) +#if LINUX_VERSION_IS_LESS(4, 6, 0) /* workaround for current issues with Debian's make-kpkg */ -#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) +#if LINUX_VERSION_IS_GEQ(4, 5, 0) #include <uapi/linux/pkt_cls.h> #endif -#endif /* < KERNEL_VERSION(4, 6, 0) */ +#endif /* LINUX_VERSION_IS_LESS(4, 6, 0) */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) +#if LINUX_VERSION_IS_LESS(4, 15, 0) #define batadv_softif_slave_add(__dev, __slave_dev, __extack) \ batadv_softif_slave_add(__dev, __slave_dev) -#endif /* < KERNEL_VERSION(4, 15, 0) */ +#endif /* LINUX_VERSION_IS_LESS(4, 15, 0) */ #endif /* __KERNEL__ */

3 years, 2 months

[alfred] master: alfred-gpsd: Fix build against gpsd ABI 9.0 (060d699)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 060d69939a09f65991c328cd40bcb628f5f86073 Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Jan 15 21:01:58 2020 +0100 alfred-gpsd: Fix build against gpsd ABI 9.0 libgpsd 3.20 removed the timestamp_t type and the function unix_to_iso8601(). The same release introduced the timespec_t based function timespec_to_iso8601(). Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 060d69939a09f65991c328cd40bcb628f5f86073 gpsd/alfred-gpsd.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/gpsd/alfred-gpsd.c b/gpsd/alfred-gpsd.c index 884bdbf..47d6a64 100644 --- a/gpsd/alfred-gpsd.c +++ b/gpsd/alfred-gpsd.c @@ -8,6 +8,8 @@ #include "alfred-gpsd.h" +#include <time.h> + static struct globals gpsd_globals; static int alfred_open_sock(struct globals *globals) @@ -64,19 +66,31 @@ static int gpsd_publish_data(struct globals *globals) return 0; } +static void gpsd_now_to_iso8601(char *tbuf, size_t len) +{ +#if GPSD_API_MAJOR_VERSION >= 9 + timespec_t now; + + clock_gettime(CLOCK_REALTIME, &now); + timespec_to_iso8601(now, tbuf, len); +#else + timestamp_t now = timestamp(); + unix_to_iso8601(now, tbuf, len); +#endif +} + static void gpsd_get_location(struct globals *globals) { if (globals->source == SOURCE_CMDLINE) { char tbuf[JSON_DATE_MAX+1]; - timestamp_t now = timestamp(); + gpsd_now_to_iso8601(tbuf, sizeof(tbuf)); sprintf(globals->gpsd_data->tpv, "{\"class\":\"TPV\",\"device\":\"command line\"," "\"time\":\"%s\"," "\"lat\":%f,\"lon\":%f,\"alt\":%f," "\"mode\":3}", - unix_to_iso8601(now, tbuf, sizeof(tbuf)), - globals->lat, globals->lon, globals->alt); + tbuf, globals->lat, globals->lon, globals->alt); globals->gpsd_data->tpv_len = htonl(strlen(globals->gpsd_data->tpv) + 1); }

3 years, 2 months

[linux-merge]linux integration; annotated tag, v5.5-rc7, created. v5.5-rc7

by postmaster＠open-mesh.org

The annotated tag, v5.5-rc7 has been created at 2bf590c16af975a0132e4a90967807d538cdc7de (tag) tagging def9d2780727cec3313ed3522d0123158d87224d (commit) replaces v5.5-rc6 tagged by Linus Torvalds on Sun Jan 19 16:02:55 2020 -0800 - Shortlog ------------------------------------------------------------ Linux 5.5-rc7 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAl4k7i8eHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGvk0IAKRenVOdiudY77SQ VZjsteyrYTTQtPPv494ToIRjR0XQ+gYp8vyWzXTUC5Nm9Y9U3VzDqUPUjWszrSXE 6mU+tzcMc9qwuUxnIFn8zfg64ygw+37sn/w3xqeH4QmF9Z5Wl3EX3SdXTs7jp3RS VxiztkUNI5ZBV2GDtla5K/9qLPqCQnUYXIiyi5lAtBtiitZDVXFp7dy7hMgEiaEO +78K5Kh3xlt5ndDsBFOlwIb2Oof3KL7bBXntdbSBc/bjol6IRvAgln48HWCv59G2 jzAp2tj2KobX9GRAEPj+v4TQZEW0SXDNDi8MgQsM+3DYVCTmANsv57CBKRuf01+F nB1kAys= =zSnJ -----END PGP SIGNATURE----- David S. Miller (1): Merge tag 'batadv-net-for-davem-20200114' of git://git.open-mesh.org/linux-merge Sven Eckelmann (1): batman-adv: Fix DAT candidate selection on little endian systems ----------------------------------------------------------------------- -- linux integration

3 years, 2 months

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits January 2020