diff options
| author |   David S. Miller <davem@davemloft.net> | 2011-01-13 12:34:21 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-13 12:34:21 -0800 |
| commit | 1949e084bfd143c76e22c0b37f370d6e7bf4bfdd (patch) | |
| tree | 56fddb33e3a268fc7514dc718ec1a242b15a960d /net | |
| parent | eth: fix new kernel-doc warning (diff) | |
| parent | netfilter: ctnetlink: fix loop in ctnetlink_get_conntrack() (diff) | |
| download | linux-dev-1949e084bfd143c76e22c0b37f370d6e7bf4bfdd.tar.xz linux-dev-1949e084bfd143c76e22c0b37f370d6e7bf4bfdd.zip | |
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, free: kfree_skb(skb2); out: - return err; + /* this avoids a loop in nfnetlink. */ + return err == -EAGAIN ? -ENOBUFS : err; } #ifdef CONFIG_NF_NAT_NEEDED |