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

mariux64 · Jan 13, 2011 · 1949e08 · 1949e08
2 parents 3806b4f + f31e8d4
commit 1949e08
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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