| commit | 1949e084bfd143c76e22c0b37f370d6e7bf4bfdd | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Thu Jan 13 12:34:21 2011 -0800 |
| committer | David S. Miller <davem@davemloft.net> | Thu Jan 13 12:34:21 2011 -0800 |
| tree | 56fddb33e3a268fc7514dc718ec1a242b15a960d | |
| parent | 3806b4f3b6115ce324b7125844f9e6acc80d34ec [diff] | |
| parent | f31e8d4982653b39fe312f9938be0f49dd9ab5fa [diff] |
Merge branch 'master' of git://1984.lsi.us.es/net-2.6
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index 5cb8d30..2b7eef3 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c
@@ -972,7 +972,8 @@ free: kfree_skb(skb2); out: - return err; + /* this avoids a loop in nfnetlink. */ + return err == -EAGAIN ? -ENOBUFS : err; } #ifdef CONFIG_NF_NAT_NEEDED