Merge tag 'platform-drivers-x86-v4.13-1' of git://git.infradead.org/linux-platform...

[karo-tx-linux.git] / include / net / inet_frag.h

diff --git a/include/net/inet_frag.h b/include/net/inet_frag.h
index 975779d0e7b086dd648429b76e3558d681e62a3d..6fdcd242777651aa75bb55ecfcb9fce53708fd53 100644 (file)
--- a/include/net/inet_frag.h
+++ b/include/net/inet_frag.h
@@ -50,7 +50,7 @@ struct inet_frag_queue {
        spinlock_t              lock;
        struct timer_list       timer;
        struct hlist_node       list;
-       atomic_t                refcnt;
+       refcount_t              refcnt;
        struct sk_buff          *fragments;
        struct sk_buff          *fragments_tail;
        ktime_t                 stamp;
@@ -129,7 +129,7 @@ void inet_frag_maybe_warn_overflow(struct inet_frag_queue *q,
 
 static inline void inet_frag_put(struct inet_frag_queue *q, struct inet_frags *f)
 {
-       if (atomic_dec_and_test(&q->refcnt))
+       if (refcount_dec_and_test(&q->refcnt))
                inet_frag_destroy(q, f);
 }
 
@@ -154,12 +154,12 @@ static inline int frag_mem_limit(struct netns_frags *nf)
 
 static inline void sub_frag_mem_limit(struct netns_frags *nf, int i)
 {
-       __percpu_counter_add(&nf->mem, -i, frag_percpu_counter_batch);
+       percpu_counter_add_batch(&nf->mem, -i, frag_percpu_counter_batch);
 }
 
 static inline void add_frag_mem_limit(struct netns_frags *nf, int i)
 {
-       __percpu_counter_add(&nf->mem, i, frag_percpu_counter_batch);
+       percpu_counter_add_batch(&nf->mem, i, frag_percpu_counter_batch);
 }
 
 static inline unsigned int sum_frag_mem_limit(struct netns_frags *nf)