[PATCH] Compile fixes for pre4-1

[Rusty Russell <rusty@xxxxxxxxxxxxxxxx>]

Linus, please apply.

Need IPPROTO_ macros from in.h; something changed recently in
a header, so now #include it directly.

Thanks,
Rusty.
--- linux-2.3.99-pre3/net/ipv4/netfilter/ip_conntrack_proto_icmp.c.~1~  Sat Mar 
18 05:26:20 2000
+++ linux-2.3.99-pre3/net/ipv4/netfilter/ip_conntrack_proto_icmp.c      Thu Mar 
30 14:06:40 2000
@@ -2,6 +2,7 @@
 #include <linux/sched.h>
 #include <linux/timer.h>
 #include <linux/netfilter.h>
+#include <linux/in.h>
 #include <linux/icmp.h>
 #include <linux/netfilter_ipv4/ip_conntrack_protocol.h>
 
--- linux-2.3.99-pre3/net/ipv4/netfilter/ip_conntrack_proto_tcp.c.~1~   Thu Mar 
30 12:10:52 2000
+++ linux-2.3.99-pre3/net/ipv4/netfilter/ip_conntrack_proto_tcp.c       Thu Mar 
30 14:06:18 2000
@@ -4,6 +4,7 @@
 #include <linux/timer.h>
 #include <linux/netfilter.h>
 #include <linux/module.h>
+#include <linux/in.h>
 #include <linux/ip.h>
 #include <linux/tcp.h>
 #include <linux/netfilter_ipv4/ip_conntrack.h>
--- linux-2.3.99-pre3/net/ipv4/netfilter/ip_conntrack_proto_udp.c.~1~   Sat Mar 
18 05:26:20 2000
+++ linux-2.3.99-pre3/net/ipv4/netfilter/ip_conntrack_proto_udp.c       Thu Mar 
30 14:06:35 2000
@@ -2,6 +2,7 @@
 #include <linux/sched.h>
 #include <linux/timer.h>
 #include <linux/netfilter.h>
+#include <linux/in.h>
 #include <linux/udp.h>
 #include <linux/netfilter_ipv4/ip_conntrack_protocol.h>
 
--- linux-2.3.99-pre3/net/ipv4/netfilter/ip_fw_compat_masq.c.~1~        Sat Mar 
18 05:26:20 2000
+++ linux-2.3.99-pre3/net/ipv4/netfilter/ip_fw_compat_masq.c    Thu Mar 30 
14:07:34 2000
@@ -5,6 +5,7 @@
    DO IT.
  */
 #include <linux/skbuff.h>
+#include <linux/in.h>
 #include <linux/ip.h>
 #include <linux/icmp.h>
 #include <linux/udp.h>

--
Hacking time.