mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
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 <[email protected]>
This commit is contained in:
commit
6338a53a2b
60 changed files with 752 additions and 626 deletions
|
|
@ -1041,7 +1041,7 @@ static inline void sk_refcnt_debug_dec(struct sock *sk)
|
|||
sk->sk_prot->name, sk, atomic_read(&sk->sk_prot->socks));
|
||||
}
|
||||
|
||||
inline void sk_refcnt_debug_release(const struct sock *sk)
|
||||
static inline void sk_refcnt_debug_release(const struct sock *sk)
|
||||
{
|
||||
if (atomic_read(&sk->sk_refcnt) != 1)
|
||||
printk(KERN_DEBUG "Destruction of the %s socket %p delayed, refcnt=%d\n",
|
||||
|
|
|
|||
Loading…
Reference in a new issue