Skip to content

Commit

Permalink
Revert "compat:inet_frag.h: Check for frag_percpu_counter_batch"
Browse files Browse the repository at this point in the history
This reverts commit 822afef.

Requested-at: https://mail.openvswitch.org/pipermail/ovs-dev/2018-January/343674.html
Requested-by: Gregory Rose <gvrose8192@gmail.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
  • Loading branch information
blp committed Jan 24, 2018
1 parent 4de6bb4 commit 6cbdf54
Showing 1 changed file with 0 additions and 14 deletions.
14 changes: 0 additions & 14 deletions datapath/linux/compat/include/net/inet_frag.h
Expand Up @@ -30,7 +30,6 @@ static inline bool inet_frag_evicting(struct inet_frag_queue *q)
#endif

#ifndef HAVE_SUB_FRAG_MEM_LIMIT_ARG_STRUCT_NETNS_FRAGS
#ifdef frag_percpu_counter_batch
static inline void rpl_sub_frag_mem_limit(struct netns_frags *nf, int i)
{
__percpu_counter_add(&nf->mem, -i, frag_percpu_counter_batch);
Expand All @@ -42,19 +41,6 @@ static inline void rpl_add_frag_mem_limit(struct netns_frags *nf, int i)
__percpu_counter_add(&nf->mem, i, frag_percpu_counter_batch);
}
#define add_frag_mem_limit rpl_add_frag_mem_limit
#else /* !frag_percpu_counter_batch */
static inline void rpl_sub_frag_mem_limit(struct netns_frags *nf, int i)
{
atomic_sub(i, &nf->mem);
}
#define sub_frag_mem_limit rpl_sub_frag_mem_limit

static inline void rpl_add_frag_mem_limit(struct netns_frags *nf, int i)
{
atomic_add(i, &nf->mem);
}
#define add_frag_mem_limit rpl_add_frag_mem_limit
#endif /* frag_percpu_counter_batch */
#endif

#ifdef HAVE_VOID_INET_FRAGS_INIT
Expand Down

0 comments on commit 6cbdf54

Please sign in to comment.