diff options
| author | David S. Miller <davem@davemloft.net> | 2014-11-01 21:53:27 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-11-01 21:53:27 +0300 |
| commit | 55b42b5ca2dcf143465968697fe6c6503b05fca1 (patch) | |
| tree | 91878cd53efc44ba67244d4d3897020828c87c01 /net/ipv4/inet_fragment.c | |
| parent | 10738eeaf4ab3de092586cefcc082e7d43ca0044 (diff) | |
| parent | ec1f1276022e4e3ca40871810217d513e39ff250 (diff) | |
| download | linux-55b42b5ca2dcf143465968697fe6c6503b05fca1.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/phy/marvell.c
Simple overlapping changes in drivers/net/phy/marvell.c
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/inet_fragment.c')
| -rw-r--r-- | net/ipv4/inet_fragment.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/inet_fragment.c b/net/ipv4/inet_fragment.c index 9eb89f3f0ee4..19419b60cb37 100644 --- a/net/ipv4/inet_fragment.c +++ b/net/ipv4/inet_fragment.c @@ -146,7 +146,6 @@ evict_again: atomic_inc(&fq->refcnt); spin_unlock(&hb->chain_lock); del_timer_sync(&fq->timer); - WARN_ON(atomic_read(&fq->refcnt) != 1); inet_frag_put(fq, f); goto evict_again; } @@ -285,7 +284,8 @@ static inline void fq_unlink(struct inet_frag_queue *fq, struct inet_frags *f) struct inet_frag_bucket *hb; hb = get_frag_bucket_locked(fq, f); - hlist_del(&fq->list); + if (!(fq->flags & INET_FRAG_EVICTED)) + hlist_del(&fq->list); spin_unlock(&hb->chain_lock); } |