summaryrefslogtreecommitdiff
path: root/backport
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2018-03-04 23:57:15 +0100
committerJohannes Berg <johannes.berg@intel.com>2018-03-21 09:19:32 +0100
commitb575639972ffc498c7c97bd478a3ba56f51dfeeb (patch)
tree6292a2571ee95ff31146311e0ee9f9197479e1ef /backport
parent63bb0c5821ca4732f6e6db3d6fd606461a321c9e (diff)
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 <hauke@hauke-m.de> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'backport')
-rw-r--r--backport/backport-include/net/inet_frag.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/backport/backport-include/net/inet_frag.h b/backport/backport-include/net/inet_frag.h
index e95eac33..f37b8a5b 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)
{