Merge branch 'pablo/nf-2.6-updates' of git://1984.lsi.us.es/net-2.6

2011-05-27 13:04:40 -04:00
parent 86e4ca66e8 c74c0bfe0b
commit 58bf2dbccc
6 changed files with 38 additions and 22 deletions
@@ -797,7 +797,8 @@ 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];