diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-27 13:04:40 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-27 13:04:40 -0400 |
| commit | 58bf2dbccc5aca12df77e2328f478e239a68bdd5 (patch) | |
| tree | 3eb8009d5029e2b5b07325c9dba1709413677395 /include/net | |
| parent | 86e4ca66e81bba0f8640f1fa19b8b8f72cbd0561 (diff) | |
| parent | c74c0bfe0b61cf41a897c2444c038e0d3f600556 (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.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h index 4fff432aeade..481f856c650f 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h | |||
| @@ -797,7 +797,8 @@ struct netns_ipvs { | |||
| 797 | struct list_head rs_table[IP_VS_RTAB_SIZE]; | 797 | struct list_head rs_table[IP_VS_RTAB_SIZE]; |
| 798 | /* ip_vs_app */ | 798 | /* ip_vs_app */ |
| 799 | struct list_head app_list; | 799 | struct list_head app_list; |
| 800 | 800 | /* ip_vs_ftp */ | |
| 801 | struct ip_vs_app *ftp_app; | ||
| 801 | /* ip_vs_proto */ | 802 | /* ip_vs_proto */ |
| 802 | #define IP_VS_PROTO_TAB_SIZE 32 /* must be power of 2 */ | 803 | #define IP_VS_PROTO_TAB_SIZE 32 /* must be power of 2 */ |
| 803 | struct ip_vs_proto_data *proto_data_table[IP_VS_PROTO_TAB_SIZE]; | 804 | struct ip_vs_proto_data *proto_data_table[IP_VS_PROTO_TAB_SIZE]; |