diff options
-rw-r--r-- | backport/backport-include/net/inet_frag.h | 38 |
1 files changed, 26 insertions, 12 deletions
diff --git a/backport/backport-include/net/inet_frag.h b/backport/backport-include/net/inet_frag.h index 3c9e11a4..e36224e0 100644 --- a/backport/backport-include/net/inet_frag.h +++ b/backport/backport-include/net/inet_frag.h @@ -11,18 +11,6 @@ static inline int frag_mem_limit(struct netns_frags *nf) return atomic_read(&nf->mem); } -#define sub_frag_mem_limit LINUX_BACKPORT(sub_frag_mem_limit) -static inline void sub_frag_mem_limit(struct inet_frag_queue *q, int i) -{ - atomic_sub(i, &q->net->mem); -} - -#define add_frag_mem_limit LINUX_BACKPORT(add_frag_mem_limit) -static inline void add_frag_mem_limit(struct inet_frag_queue *q, int i) -{ - atomic_add(i, &q->net->mem); -} - #define init_frag_mem_limit LINUX_BACKPORT(init_frag_mem_limit) static inline void init_frag_mem_limit(struct netns_frags *nf) { @@ -40,5 +28,31 @@ void inet_frag_maybe_warn_overflow(struct inet_frag_queue *q, const char *prefix); #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,9,0) */ +/* the type of the paramater changed with kernel 4.3 */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,9,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) +{ + atomic_sub(i, &nf->mem); +} + +#define add_frag_mem_limit LINUX_BACKPORT(add_frag_mem_limit) +static inline void add_frag_mem_limit(struct netns_frags *nf, int i) +{ + atomic_add(i, &nf->mem); +} +#elif LINUX_VERSION_CODE < KERNEL_VERSION(4,3,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) +{ + __percpu_counter_add(&nf->mem, -i, frag_percpu_counter_batch); +} + +#define add_frag_mem_limit LINUX_BACKPORT(add_frag_mem_limit) +static inline void add_frag_mem_limit(struct netns_frags *nf, int i) +{ + __percpu_counter_add(&nf->mem, i, frag_percpu_counter_batch); +} +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4,3,0) */ #endif /* __BACKPORT__NET_FRAG_H__ */ |