forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
David S. Miller 2011-01-13 12:34:21 -08:00
commit 1949e084bf
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
net/netfilter/nf_conntrack_netlink.c
View file

@ -972,7 +972,8 @@ ctnetlink_get_conntrack(struct sock *ctnl, struct sk_buff *skb,
free: free:
kfree_skb(skb2); kfree_skb(skb2);
out: out:
return err; /* this avoids a loop in nfnetlink. */
return err == -EAGAIN ? -ENOBUFS : err;
} }
#ifdef CONFIG_NF_NAT_NEEDED #ifdef CONFIG_NF_NAT_NEEDED