Merge branch 'master' of git://1984.lsi.us.es/net-2.6
This commit is contained in:
@@ -972,7 +972,8 @@ ctnetlink_get_conntrack(struct sock *ctnl, struct sk_buff *skb,
|
|||||||
free:
|
free:
|
||||||
kfree_skb(skb2);
|
kfree_skb(skb2);
|
||||||
out:
|
out:
|
||||||
return err;
|
/* this avoids a loop in nfnetlink. */
|
||||||
|
return err == -EAGAIN ? -ENOBUFS : err;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_NF_NAT_NEEDED
|
#ifdef CONFIG_NF_NAT_NEEDED
|
||||||
|
Reference in New Issue
Block a user