Add changes from the Linux-2.6 tree.

[linux-2.6.git] / include / linux / netfilter_ipv4 / ip_conntrack_tftp.h

diff --git a/include/linux/netfilter_ipv4/ip_conntrack_tftp.h b/include/linux/netfilter_ipv4/ip_conntrack_tftp.h
index 8b75b45..a404fc0 100644 (file)
--- a/include/linux/netfilter_ipv4/ip_conntrack_tftp.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_tftp.h
@@ -4,7 +4,7 @@
 #define TFTP_PORT 69
 
 struct tftphdr {
-       u_int16_t opcode;
+       __be16 opcode;
 };
 
 #define TFTP_OPCODE_READ       1
@@ -13,4 +13,8 @@ struct tftphdr {
 #define TFTP_OPCODE_ACK                4
 #define TFTP_OPCODE_ERROR      5
 
+extern unsigned int (*ip_nat_tftp_hook)(struct sk_buff **pskb,
+                                enum ip_conntrack_info ctinfo,
+                                struct ip_conntrack_expect *exp);
+
 #endif /* _IP_CT_TFTP */