Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6 (c79b9e49) · Commits · e / devices / android_kernel_xiaomi_nabu

net/netfilter/ipvs/ip_vs_core.c

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1894,9 +1894,7 @@ static int __net_init __ip_vs_init(struct net *net)

	static void __net_exit __ip_vs_cleanup(struct net *net)		static void __net_exit __ip_vs_cleanup(struct net *net)
	{		{
	struct netns_ipvs *ipvs = net_ipvs(net);		IP_VS_DBG(10, "ipvs netns %d released\n", net_ipvs(net)->gen);

	IP_VS_DBG(10, "ipvs netns %d released\n", ipvs->gen);
	}		}

	static struct pernet_operations ipvs_core_ops = {		static struct pernet_operations ipvs_core_ops = {

net/netfilter/ipvs/ip_vs_ctl.c

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2062,7 +2062,9 @@ static const struct file_operations ip_vs_stats_percpu_fops = {
	*/		*/
	static int ip_vs_set_timeout(struct net net, struct ip_vs_timeout_user u)		static int ip_vs_set_timeout(struct net net, struct ip_vs_timeout_user u)
	{		{
			#if defined(CONFIG_IP_VS_PROTO_TCP) \|\| defined(CONFIG_IP_VS_PROTO_UDP)
	struct ip_vs_proto_data *pd;		struct ip_vs_proto_data *pd;
			#endif

	IP_VS_DBG(2, "Setting timeout tcp:%d tcpfin:%d udp:%d\n",		IP_VS_DBG(2, "Setting timeout tcp:%d tcpfin:%d udp:%d\n",
	u->tcp_timeout,		u->tcp_timeout,
	@@ -2405,7 +2407,9 @@ __ip_vs_get_dest_entries(struct net net, const struct ip_vs_get_dests get,
	static inline void		static inline void
	__ip_vs_get_timeouts(struct net net, struct ip_vs_timeout_user u)		__ip_vs_get_timeouts(struct net net, struct ip_vs_timeout_user u)
	{		{
			#if defined(CONFIG_IP_VS_PROTO_TCP) \|\| defined(CONFIG_IP_VS_PROTO_UDP)
	struct ip_vs_proto_data *pd;		struct ip_vs_proto_data *pd;
			#endif

	#ifdef CONFIG_IP_VS_PROTO_TCP		#ifdef CONFIG_IP_VS_PROTO_TCP
	pd = ip_vs_proto_data_get(net, IPPROTO_TCP);		pd = ip_vs_proto_data_get(net, IPPROTO_TCP);
	@@ -3552,7 +3556,7 @@ int __net_init __ip_vs_control_init(struct net *net)


	ipvs->sysctl_hdr = register_net_sysctl_table(net, net_vs_ctl_path,		ipvs->sysctl_hdr = register_net_sysctl_table(net, net_vs_ctl_path,
	vs_vars);		tbl);
	if (ipvs->sysctl_hdr == NULL)		if (ipvs->sysctl_hdr == NULL)
	goto err_reg;		goto err_reg;
	ip_vs_new_estimator(net, ipvs->tot_stats);		ip_vs_new_estimator(net, ipvs->tot_stats);

net/netfilter/ipvs/ip_vs_proto.c

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -60,6 +60,9 @@ static int __used __init register_ip_vs_protocol(struct ip_vs_protocol *pp)
	return 0;		return 0;
	}		}

			#if defined(CONFIG_IP_VS_PROTO_TCP) \|\| defined(CONFIG_IP_VS_PROTO_UDP) \|\| \
			defined(CONFIG_IP_VS_PROTO_SCTP) \|\| defined(CONFIG_IP_VS_PROTO_AH) \|\| \
			defined(CONFIG_IP_VS_PROTO_ESP)
	/*		/*
	* register an ipvs protocols netns related data		* register an ipvs protocols netns related data
	*/		*/
	@@ -85,6 +88,7 @@ register_ip_vs_proto_netns(struct net net, struct ip_vs_protocol pp)

	return 0;		return 0;
	}		}
			#endif

	/*		/*
	* unregister an ipvs protocol		* unregister an ipvs protocol

net/netfilter/ipvs/ip_vs_sync.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1305,7 +1305,7 @@ static struct socket make_send_sock(struct net net)
	int result;		int result;

	/* First create a socket */		/* First create a socket */
	result = sock_create_kern(PF_INET, SOCK_DGRAM, IPPROTO_UDP, &sock);		result = __sock_create(net, PF_INET, SOCK_DGRAM, IPPROTO_UDP, &sock, 1);
	if (result < 0) {		if (result < 0) {
	pr_err("Error during creation of socket; terminating\n");		pr_err("Error during creation of socket; terminating\n");
	return ERR_PTR(result);		return ERR_PTR(result);
	@@ -1351,7 +1351,7 @@ static struct socket make_receive_sock(struct net net)
	int result;		int result;

	/* First create a socket */		/* First create a socket */
	result = sock_create_kern(PF_INET, SOCK_DGRAM, IPPROTO_UDP, &sock);		result = __sock_create(net, PF_INET, SOCK_DGRAM, IPPROTO_UDP, &sock, 1);
	if (result < 0) {		if (result < 0) {
	pr_err("Error during creation of socket; terminating\n");		pr_err("Error during creation of socket; terminating\n");
	return ERR_PTR(result);		return ERR_PTR(result);

net/netfilter/xt_connlimit.c

+8 −4

Original line number	Original line	Diff line number	Diff line
	@@ -185,11 +185,15 @@ connlimit_mt(const struct sk_buff skb, struct xt_action_param par)
	int connections;		int connections;

	ct = nf_ct_get(skb, &ctinfo);		ct = nf_ct_get(skb, &ctinfo);
	if (ct != NULL)		if (ct != NULL) {
	tuple_ptr = &ct->tuplehash[0].tuple;		if (info->flags & XT_CONNLIMIT_DADDR)
	else if (!nf_ct_get_tuplepr(skb, skb_network_offset(skb),		tuple_ptr = &ct->tuplehash[IP_CT_DIR_REPLY].tuple;
	par->family, &tuple))		else
			tuple_ptr = &ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple;
			} else if (!nf_ct_get_tuplepr(skb, skb_network_offset(skb),
			par->family, &tuple)) {
	goto hotdrop;		goto hotdrop;
			}

	if (par->family == NFPROTO_IPV6) {		if (par->family == NFPROTO_IPV6) {
	const struct ipv6hdr *iph = ipv6_hdr(skb);		const struct ipv6hdr *iph = ipv6_hdr(skb);