Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf277b0c authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://1984.lsi.us.es/nf-next 



Pablo Neira Ayuso says:

====================
This is the first batch of Netfilter and IPVS updates for your
net-next tree. Mostly cleanups for the Netfilter side. They are:

* Remove unnecessary RTNL locking now that we have support
  for namespace in nf_conntrack, from Patrick McHardy.

* Cleanup to eliminate unnecessary goto in the initialization
  path of several Netfilter tables, from Jean Sacren.

* Another cleanup from Wu Fengguang, this time to PTR_RET instead
  of if IS_ERR then return PTR_ERR.

* Use list_for_each_entry_continue_rcu in nf_iterate, from
  Michael Wang.

* Add pmtu_disc sysctl option to disable PMTU in their tunneling
  transmitter, from Julian Anastasov.

* Generalize application protocol registration in IPVS and modify
  IPVS FTP helper to use it, from Julian Anastasov.

* update Kconfig. The IPVS FTP helper depends on the Netfilter FTP
  helper for NAT support, from Julian Anastasov.

* Add logic to update PMTU for IPIP packets in IPVS, again
  from Julian Anastasov.

* A couple of sparse warning fixes for IPVS and Netfilter from
  Claudiu Ghioc and Patrick McHardy respectively.

Patrick's IPv6 NAT changes will follow after this batch, I need
to flush this batch first before refreshing my tree.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents bba6ec7e 90efbed1

include/net/ip_vs.h

+13 −3
Original line number Diff line number Diff line
@@ -808,8 +808,6 @@ struct netns_ipvs { 
	struct list_head	rs_table[IP_VS_RTAB_SIZE];

	/* ip_vs_app */

	struct list_head	app_list;

	/* ip_vs_ftp */

	struct ip_vs_app	*ftp_app;

	/* ip_vs_proto */

	#define IP_VS_PROTO_TAB_SIZE	32	/* must be power of 2 */

	struct ip_vs_proto_data *proto_data_table[IP_VS_PROTO_TAB_SIZE];
@@ -890,6 +888,7 @@ struct netns_ipvs { 
	unsigned int		sysctl_sync_refresh_period;

	int			sysctl_sync_retries;

	int			sysctl_nat_icmp_send;

	int			sysctl_pmtu_disc;



	/* ip_vs_lblc */

	int			sysctl_lblc_expiration;
@@ -976,6 +975,11 @@ static inline int sysctl_sync_sock_size(struct netns_ipvs *ipvs) 
	return ipvs->sysctl_sync_sock_size;

}



static inline int sysctl_pmtu_disc(struct netns_ipvs *ipvs)

{

	return ipvs->sysctl_pmtu_disc;

}



#else



static inline int sysctl_sync_threshold(struct netns_ipvs *ipvs)
@@ -1018,6 +1022,11 @@ static inline int sysctl_sync_sock_size(struct netns_ipvs *ipvs) 
	return 0;

}



static inline int sysctl_pmtu_disc(struct netns_ipvs *ipvs)

{

	return 1;

}



#endif



/*
@@ -1179,7 +1188,8 @@ extern void ip_vs_service_net_cleanup(struct net *net); 
 *      (from ip_vs_app.c)

 */

#define IP_VS_APP_MAX_PORTS  8

extern int register_ip_vs_app(struct net *net, struct ip_vs_app *app);

extern struct ip_vs_app *register_ip_vs_app(struct net *net,

					    struct ip_vs_app *app);

extern void unregister_ip_vs_app(struct net *net, struct ip_vs_app *app);

extern int ip_vs_bind_app(struct ip_vs_conn *cp, struct ip_vs_protocol *pp);

extern void ip_vs_unbind_app(struct ip_vs_conn *cp);

net/bridge/netfilter/ebtable_filter.c

+1 −3
Original line number Diff line number Diff line
@@ -100,9 +100,7 @@ static struct nf_hook_ops ebt_ops_filter[] __read_mostly = { 
static int __net_init frame_filter_net_init(struct net *net)

{

	net->xt.frame_filter = ebt_register_table(net, &frame_filter);

	if (IS_ERR(net->xt.frame_filter))

		return PTR_ERR(net->xt.frame_filter);

	return 0;

	return PTR_RET(net->xt.frame_filter);

}



static void __net_exit frame_filter_net_exit(struct net *net)

net/bridge/netfilter/ebtable_nat.c

+1 −3
Original line number Diff line number Diff line
@@ -100,9 +100,7 @@ static struct nf_hook_ops ebt_ops_nat[] __read_mostly = { 
static int __net_init frame_nat_net_init(struct net *net)

{

	net->xt.frame_nat = ebt_register_table(net, &frame_nat);

	if (IS_ERR(net->xt.frame_nat))

		return PTR_ERR(net->xt.frame_nat);

	return 0;

	return PTR_RET(net->xt.frame_nat);

}



static void __net_exit frame_nat_net_exit(struct net *net)

net/ipv4/netfilter/iptable_filter.c

+2 −8
Original line number Diff line number Diff line
@@ -69,9 +69,7 @@ static int __net_init iptable_filter_net_init(struct net *net) 
	net->ipv4.iptable_filter =

		ipt_register_table(net, &packet_filter, repl);

	kfree(repl);

	if (IS_ERR(net->ipv4.iptable_filter))

		return PTR_ERR(net->ipv4.iptable_filter);

	return 0;

	return PTR_RET(net->ipv4.iptable_filter);

}



static void __net_exit iptable_filter_net_exit(struct net *net)
@@ -96,14 +94,10 @@ static int __init iptable_filter_init(void) 
	filter_ops = xt_hook_link(&packet_filter, iptable_filter_hook);

	if (IS_ERR(filter_ops)) {

		ret = PTR_ERR(filter_ops);

		goto cleanup_table;

		unregister_pernet_subsys(&iptable_filter_net_ops);

	}



	return ret;



 cleanup_table:

	unregister_pernet_subsys(&iptable_filter_net_ops);

	return ret;

}



static void __exit iptable_filter_fini(void)

net/ipv4/netfilter/iptable_mangle.c

+2 −8
Original line number Diff line number Diff line
@@ -104,9 +104,7 @@ static int __net_init iptable_mangle_net_init(struct net *net) 
	net->ipv4.iptable_mangle =

		ipt_register_table(net, &packet_mangler, repl);

	kfree(repl);

	if (IS_ERR(net->ipv4.iptable_mangle))

		return PTR_ERR(net->ipv4.iptable_mangle);

	return 0;

	return PTR_RET(net->ipv4.iptable_mangle);

}



static void __net_exit iptable_mangle_net_exit(struct net *net)
@@ -131,14 +129,10 @@ static int __init iptable_mangle_init(void) 
	mangle_ops = xt_hook_link(&packet_mangler, iptable_mangle_hook);

	if (IS_ERR(mangle_ops)) {

		ret = PTR_ERR(mangle_ops);

		goto cleanup_table;

		unregister_pernet_subsys(&iptable_mangle_net_ops);

	}



	return ret;



 cleanup_table:

	unregister_pernet_subsys(&iptable_mangle_net_ops);

	return ret;

}



static void __exit iptable_mangle_fini(void)