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

1949e084 · David S. Miller · 3806b4f3 · f31e8d49 · 1949e084
Commit 1949e084 authored Jan 13, 2011 by David S. Miller
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

net/netfilter/nf_conntrack_netlink.c net/netfilter/nf_conntrack_netlink.c +2 -1

No files found.
--- 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