From 2612d51d2fb0078212ec78c665805daa524f745b Mon Sep 17 00:00:00 2001 From: Arend Van Spriel Date: Mon, 30 Apr 2018 13:15:46 +0200 Subject: backport-include: deal with struct sock::sk_pacing_shift In kernel 4.15 the field sk_pacing_shift was introduced to allow (wifi) drivers to change the behaviour of TSQ. In 4.16 a helper function was added which mac80211 is using. So backport the helper which is just a stub for kernels prior to 4.15. Cc: Eric Dumazet Signed-off-by: Arend van Spriel Signed-off-by: Johannes Berg --- backport/backport-include/net/sock.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/backport/backport-include/net/sock.h b/backport/backport-include/net/sock.h index 89191f37..39bf0087 100644 --- a/backport/backport-include/net/sock.h +++ b/backport/backport-include/net/sock.h @@ -63,4 +63,16 @@ static inline void sk_clear_bit(int nr, struct sock *sk) } #endif /* < 4.5 */ +#if LINUX_VERSION_IS_LESS(4,16,0) +#define sk_pacing_shift_update LINUX_BACKPORT(sk_pacing_shift_update) +static inline void sk_pacing_shift_update(struct sock *sk, int val) +{ +#if LINUX_VERSION_IS_GEQ(4,15,0) + if (!sk || !sk_fullsock(sk) || sk->sk_pacing_shift == val) + return; + sk->sk_pacing_shift = val; +#endif /* >= 4.15 */ +} +#endif /* < 4.16 */ + #endif /* __BACKPORT_NET_SOCK_H */ -- cgit v1.2.3