mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-08 12:58:12 -04:00
Merge branch 'master' of git://1984.lsi.us.es/net-2.6
This commit is contained in:
commit
1949e084bf
1 changed files with 2 additions and 1 deletions
|
|
@ -972,7 +972,8 @@ ctnetlink_get_conntrack(struct sock *ctnl, struct sk_buff *skb,
|
|||
free:
|
||||
kfree_skb(skb2);
|
||||
out:
|
||||
return err;
|
||||
/* this avoids a loop in nfnetlink. */
|
||||
return err == -EAGAIN ? -ENOBUFS : err;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_NF_NAT_NEEDED
|
||||
|
|
|
|||
Loading…
Reference in a new issue