diff options
| author | David S. Miller <davem@davemloft.net> | 2015-07-23 09:41:16 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-07-23 09:41:16 +0200 |
| commit | c5e40ee287db61a79af1746954ee03ebbf1ff8a3 (patch) | |
| tree | 007da00e75e9b84766ac4868421705300e1e2e14 /net/core/dst.c | |
| parent | ip_tunnel: Provide tunnel metadata API for CONFIG_INET=n (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-c5e40ee287db61a79af1746954ee03ebbf1ff8a3.tar.xz linux-c5e40ee287db61a79af1746954ee03ebbf1ff8a3.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/bridge/br_mdb.c
br_mdb.c conflict was a function call being removed to fix a bug in
'net' but whose signature was changed in 'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/dst.c')
| -rw-r--r-- | net/core/dst.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/core/dst.c b/net/core/dst.c index 917364f0d0be..76a617f6d60a 100644 --- a/net/core/dst.c +++ b/net/core/dst.c @@ -299,7 +299,9 @@ void dst_release(struct dst_entry *dst) int newrefcnt; newrefcnt = atomic_dec_return(&dst->__refcnt); - WARN_ON(newrefcnt < 0); + if (unlikely(newrefcnt < 0)) + net_warn_ratelimited("%s: dst:%p refcnt:%d\n", + __func__, dst, newrefcnt); if (unlikely(dst->flags & DST_NOCACHE) && !newrefcnt) call_rcu(&dst->rcu_head, dst_destroy_rcu); } |