From: Hauke Mehrtens Date: Sun, 4 Mar 2018 22:57:15 +0000 (+0100) Subject: header: inet_frag.h: Use old version of in sub_frag_mem_limit() for kernel 3.16 X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=b575639972ffc498c7c97bd478a3ba56f51dfeeb;p=openwrt%2Fstaging%2Fblogic.git header: inet_frag.h: Use old version of in sub_frag_mem_limit() for kernel 3.16 In Linux commit d19c3d91d1cf3 ("Revert "net: use lib/percpu_counter API for fragmentation mem accounting"") the sub_frag_mem_limit() and add_frag_mem_limit() functions were changed back to the old versions. Signed-off-by: Hauke Mehrtens Signed-off-by: Johannes Berg --- diff --git a/backport/backport-include/net/inet_frag.h b/backport/backport-include/net/inet_frag.h index e95eac33043c..f37b8a5b03ce 100644 --- a/backport/backport-include/net/inet_frag.h +++ b/backport/backport-include/net/inet_frag.h @@ -29,7 +29,7 @@ void inet_frag_maybe_warn_overflow(struct inet_frag_queue *q, #endif /* LINUX_VERSION_IS_LESS(3,9,0) */ /* the type of the paramater changed with kernel 4.3 */ -#if LINUX_VERSION_IS_LESS(3,9,0) +#if LINUX_VERSION_IS_LESS(3,9,0) || LINUX_VERSION_IN_RANGE(3,16,51, 3,17,0) #define sub_frag_mem_limit LINUX_BACKPORT(sub_frag_mem_limit) static inline void sub_frag_mem_limit(struct netns_frags *nf, int i) {