Merge branch 'master' of git://1984.lsi.us.es/net-2.6 (1949e084) · Commits · e / devices / android_kernel_teracube_mt6765

net/netfilter/nf_conntrack_netlink.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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