diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-13 15:34:21 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-13 15:34:21 -0500 |
| commit | 1949e084bfd143c76e22c0b37f370d6e7bf4bfdd (patch) | |
| tree | 56fddb33e3a268fc7514dc718ec1a242b15a960d /net | |
| parent | 3806b4f3b6115ce324b7125844f9e6acc80d34ec (diff) | |
| parent | f31e8d4982653b39fe312f9938be0f49dd9ab5fa (diff) | |
Merge branch 'master' of git://1984.lsi.us.es/net-2.6
Diffstat (limited to 'net')
| -rw-r--r-- | net/netfilter/nf_conntrack_netlink.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index 5cb8d3027b18..2b7eef37875c 100644 --- 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, | |||
| 972 | free: | 972 | free: |
| 973 | kfree_skb(skb2); | 973 | kfree_skb(skb2); |
| 974 | out: | 974 | out: |
| 975 | return err; | 975 | /* this avoids a loop in nfnetlink. */ |
| 976 | return err == -EAGAIN ? -ENOBUFS : err; | ||
| 976 | } | 977 | } |
| 977 | 978 | ||
| 978 | #ifdef CONFIG_NF_NAT_NEEDED | 979 | #ifdef CONFIG_NF_NAT_NEEDED |