Merge branch 'master' of git://1984.lsi.us.es/net-2.6

2011-01-13 12:34:21 -08:00 · 2011-01-13 12:34:21 -08:00 · 1949e084bf
parent 3806b4f3b6 f31e8d4982
commit 1949e084bf
1 changed files with 2 additions and 1 deletions
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@ -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