From 351e820b3011171257f9388bd19e458a7c909f8c Mon Sep 17 00:00:00 2001 From: Luca Coelho Date: Thu, 20 Sep 2018 14:28:38 +0300 Subject: backport: update u64_stats_init() to a new version in kernels < 4.2 The u64_stats_init() macro was turned into a static inline function in v4.2 to prevent warnings that happen when its argument is not used elsewhere. Since we started hitting these warnings, undefine the macro and define the static inline to prevent them. Signed-off-by: Luca Coelho Signed-off-by: Johannes Berg --- backport/backport-include/linux/netdevice.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/backport/backport-include/linux/netdevice.h b/backport/backport-include/linux/netdevice.h index 8723f8c5..44319331 100644 --- a/backport/backport-include/linux/netdevice.h +++ b/backport/backport-include/linux/netdevice.h @@ -263,6 +263,16 @@ netdev_features_t passthru_features_check(struct sk_buff *skb, netdev_features_t features); #endif /* LINUX_VERSION_IS_LESS(4,1,0) */ +#if LINUX_VERSION_IS_LESS(4,2,0) +#undef u64_stats_init +static inline void u64_stats_init(struct u64_stats_sync *syncp) +{ +#if BITS_PER_LONG == 32 && defined(CONFIG_SMP) + seqcount_init(&syncp->seq); +#endif +} +#endif /* LINUX_VERSION_IS_LESS(4,2,0) */ + #ifndef netdev_alloc_pcpu_stats #define netdev_alloc_pcpu_stats(type) \ ({ \ -- cgit v1.2.3