fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / include / linux / netfilter / nf_conntrack_ftp.h

diff --git a/include/linux/netfilter/nf_conntrack_ftp.h b/include/linux/netfilter/nf_conntrack_ftp.h
index ad4a41c..81453ea 100644 (file)
--- a/include/linux/netfilter/nf_conntrack_ftp.h
+++ b/include/linux/netfilter/nf_conntrack_ftp.h
@@ -3,16 +3,16 @@
 /* FTP tracking. */
 
 /* This enum is exposed to userspace */
-enum ip_ct_ftp_type
+enum nf_ct_ftp_type
 {
        /* PORT command from client */
-       IP_CT_FTP_PORT,
+       NF_CT_FTP_PORT,
        /* PASV response from server */
-       IP_CT_FTP_PASV,
+       NF_CT_FTP_PASV,
        /* EPRT command from client */
-       IP_CT_FTP_EPRT,
+       NF_CT_FTP_EPRT,
        /* EPSV response from server */
-       IP_CT_FTP_EPSV,
+       NF_CT_FTP_EPSV,
 };
 
 #ifdef __KERNEL__
@@ -21,23 +21,23 @@ enum ip_ct_ftp_type
 
 #define NUM_SEQ_TO_REMEMBER 2
 /* This structure exists only once per master */
-struct ip_ct_ftp_master {
+struct nf_ct_ftp_master {
        /* Valid seq positions for cmd matching after newline */
        u_int32_t seq_aft_nl[IP_CT_DIR_MAX][NUM_SEQ_TO_REMEMBER];
        /* 0 means seq_match_aft_nl not set */
        int seq_aft_nl_num[IP_CT_DIR_MAX];
 };
 
-struct ip_conntrack_expect;
+struct nf_conntrack_expect;
 
 /* For NAT to hook in when we find a packet which describes what other
  * connection we should expect. */
-extern unsigned int (*ip_nat_ftp_hook)(struct sk_buff **pskb,
+extern unsigned int (*nf_nat_ftp_hook)(struct sk_buff **pskb,
                                       enum ip_conntrack_info ctinfo,
-                                      enum ip_ct_ftp_type type,
+                                      enum nf_ct_ftp_type type,
                                       unsigned int matchoff,
                                       unsigned int matchlen,
-                                      struct ip_conntrack_expect *exp,
+                                      struct nf_conntrack_expect *exp,
                                       u32 *seq);
 #endif /* __KERNEL__ */