diff options
| author | David S. Miller <davem@davemloft.net> | 2013-02-18 23:32:49 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-02-18 23:34:21 -0500 |
| commit | 6338a53a2bd02d5878ab449371323364b7cc7694 (patch) | |
| tree | 461c4acae130771b9856715bc2cfdc341b6e5964 /include/net | |
| parent | 8064b3cf750e71fdaf306abb4433a93d0f45f4c9 (diff) | |
| parent | 18cf0d0784b4a634472ed24d0d7ca1c721d93e90 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net into net
Pull in 'net' to take in the bug fixes that didn't make it into
3.8-final.
Also, deal with the semantic conflict of the change made to
net/ipv6/xfrm6_policy.c A missing rt6->n neighbour release
was added to 'net', but in 'net-next' we no longer cache the
neighbour entries in the ipv6 routes so that change is not
appropriate there.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/sock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index a340ab46b41c..a66caa223d18 100644 --- a/include/net/sock.h +++ b/include/net/sock.h | |||
| @@ -1041,7 +1041,7 @@ static inline void sk_refcnt_debug_dec(struct sock *sk) | |||
| 1041 | sk->sk_prot->name, sk, atomic_read(&sk->sk_prot->socks)); | 1041 | sk->sk_prot->name, sk, atomic_read(&sk->sk_prot->socks)); |
| 1042 | } | 1042 | } |
| 1043 | 1043 | ||
| 1044 | inline void sk_refcnt_debug_release(const struct sock *sk) | 1044 | static inline void sk_refcnt_debug_release(const struct sock *sk) |
| 1045 | { | 1045 | { |
| 1046 | if (atomic_read(&sk->sk_refcnt) != 1) | 1046 | if (atomic_read(&sk->sk_refcnt) != 1) |
| 1047 | printk(KERN_DEBUG "Destruction of the %s socket %p delayed, refcnt=%d\n", | 1047 | printk(KERN_DEBUG "Destruction of the %s socket %p delayed, refcnt=%d\n", |