# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2005/01/25 04:12:44+01:00 gandalf@wlug.westbo.se 
#   [NETFILTER]: Fix compile with NAT but without modules
#   
#   Here's another patch to fix compile-errors, this time with NAT but
#   without modules. There's a missing 'extern' in ip_conntrack_tftp.h
#   
#   Signed-off-by: Martin Josefsson <gandalf@wlug.westbo.se>
#   Signed-off-by: Patrick McHardy <kaber@trash.net>
# 
# include/linux/netfilter_ipv4/ip_conntrack_tftp.h
#   2005/01/25 04:12:37+01:00 gandalf@wlug.westbo.se +1 -1
#   [NETFILTER]: Fix compile with NAT but without modules
#   
#   Here's another patch to fix compile-errors, this time with NAT but
#   without modules. There's a missing 'extern' in ip_conntrack_tftp.h
#   
#   Signed-off-by: Martin Josefsson <gandalf@wlug.westbo.se>
#   Signed-off-by: Patrick McHardy <kaber@trash.net>
# 
diff -Nru a/include/linux/netfilter_ipv4/ip_conntrack_tftp.h b/include/linux/netfilter_ipv4/ip_conntrack_tftp.h
--- a/include/linux/netfilter_ipv4/ip_conntrack_tftp.h	2005-01-25 04:37:16 +01:00
+++ b/include/linux/netfilter_ipv4/ip_conntrack_tftp.h	2005-01-25 04:37:16 +01:00
@@ -13,7 +13,7 @@
 #define TFTP_OPCODE_ACK		4
 #define TFTP_OPCODE_ERROR	5
 
-unsigned int (*ip_nat_tftp_hook)(struct sk_buff **pskb,
+extern unsigned int (*ip_nat_tftp_hook)(struct sk_buff **pskb,
 				 enum ip_conntrack_info ctinfo,
 				 struct ip_conntrack_expect *exp);