diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-10-04 12:03:22 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-10-04 12:03:22 +0800 |
| commit | cda2b9481445e798669f00fb8275d595f1ff943f (patch) | |
| tree | b70f5c939c38f61ca7258746f125ddc901466508 /net/ipv4/inet_fragment.c | |
| parent | 9173606ce35faae345352f97cdae0579c3d05c4a (diff) | |
| parent | 10def3a6779924f7bb130200b8b940caf2914111 (diff) | |
Merge tag 'v4.4.89' into linux-linaro-lsk-v4.4lsk-v4.4-17.09
This is the 4.4.89 stable release
Diffstat (limited to 'net/ipv4/inet_fragment.c')
| -rw-r--r-- | net/ipv4/inet_fragment.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/ipv4/inet_fragment.c b/net/ipv4/inet_fragment.c index fe144dae7372..c5fb2f694ed0 100644 --- a/net/ipv4/inet_fragment.c +++ b/net/ipv4/inet_fragment.c @@ -234,10 +234,8 @@ evict_again: cond_resched(); if (read_seqretry(&f->rnd_seqlock, seq) || - percpu_counter_sum(&nf->mem)) + sum_frag_mem_limit(nf)) goto evict_again; - - percpu_counter_destroy(&nf->mem); } EXPORT_SYMBOL(inet_frags_exit_net); |