aboutsummaryrefslogtreecommitdiff
path: root/include/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-05-27 13:04:40 -0400
committerDavid S. Miller <davem@davemloft.net>2011-05-27 13:04:40 -0400
commit58bf2dbccc5aca12df77e2328f478e239a68bdd5 (patch)
tree3eb8009d5029e2b5b07325c9dba1709413677395 /include/net
parent86e4ca66e81bba0f8640f1fa19b8b8f72cbd0561 (diff)
parentc74c0bfe0b61cf41a897c2444c038e0d3f600556 (diff)
Merge branch 'pablo/nf-2.6-updates' of git://1984.lsi.us.es/net-2.6
Diffstat (limited to 'include/net')
-rw-r--r--include/net/ip_vs.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index 4fff432aead..481f856c650 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -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];