mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-25 14:13:01 -04:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
This commit is contained in:
commit
51c24aaaca
1380 changed files with 31844 additions and 11830 deletions
|
|
@ -338,7 +338,7 @@ static inline int sk_mc_loop(struct sock *sk)
|
|||
return inet6_sk(sk)->mc_loop;
|
||||
#endif
|
||||
}
|
||||
__WARN();
|
||||
WARN_ON(1);
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -132,6 +132,8 @@ static __inline__ void nr_node_put(struct nr_node *nr_node)
|
|||
static __inline__ void nr_neigh_put(struct nr_neigh *nr_neigh)
|
||||
{
|
||||
if (atomic_dec_and_test(&nr_neigh->refcount)) {
|
||||
if (nr_neigh->ax25)
|
||||
ax25_cb_put(nr_neigh->ax25);
|
||||
kfree(nr_neigh->digipeat);
|
||||
kfree(nr_neigh);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue