[PATCH] Briging doesn't compile without TCP/IP Networking

[PATCH] Briging doesn't compile without TCP/IP Networking

[Christian Koenig]

Hi,

I accidently destroyed the Kernel of my self made bridge (old 486 / 4 PCI 
nics).
When i tried to compile an new one (2.4.17) I've got a compile error in
include/net/tcp_ecn.h

Is this patch suitable or could you tell me why unix sokets
and others need tcp.h ? 

MfG, Christian Koenig.

diff -Nurb linux-2.4.17.orig/include/net/tcp_ecn.h 
linux-2.4.17/include/net/tcp_ecn.h
--- linux-2.4.17.orig/include/net/tcp_ecn.h	Sat Nov  3 02:43:26 2001
+++ linux-2.4.17/include/net/tcp_ecn.h	Thu Jan 10 22:28:26 2002
@@ -44,6 +44,8 @@
 		th->ece = 1;
 }

+#ifdef CONFIG_INET
+
 static __inline__ void
 TCP_ECN_send(struct sock *sk, struct tcp_opt *tp, struct sk_buff *skb, int 
tcp_header_len)
 {
@@ -64,6 +66,8 @@
 			skb->h.th->ece = 1;
 	}
 }
+
+#endif //CONFIG_INET

 /* Input functions */

Re: [PATCH] Briging doesn't compile without TCP/IP Networking

[David S. Miller]

   From: "ChristianK."@t-online.de (Christian Koenig)
   Date: Thu, 10 Jan 2002 22:50:45 +0100

   I accidently destroyed the Kernel of my self made bridge (old 486 / 4 PCI 
   nics).
   When i tried to compile an new one (2.4.17) I've got a compile error in
   include/net/tcp_ecn.h
   
   Is this patch suitable or could you tell me why unix sokets
   and others need tcp.h ? 

It is better to conditionalize or remove the include than to add
CONFIG_INET ifdefs to a TCP header :-)

I thought I had fixed this in current kernels...

Re: [PATCH] Briging doesn't compile without TCP/IP Networking

[Christian Koenig]

Hi,

On Friday 11 January 2002 04:17, David S. Miller wrote:
>
> It is better to conditionalize or remove the include than to add
> CONFIG_INET ifdefs to a TCP header :-)
>
> I thought I had fixed this in current kernels...
Nope, not all.
I thing it's the right thing to remove / replace it with other
include's

Check,this one is this better ?

MfG, Christian K. (And sorry for my poor English).

diff -Nubr linux-2.4.17.orig/net/core/rtnetlink.c 
linux-2.4.17/net/core/rtnetlink.c
--- linux-2.4.17.orig/net/core/rtnetlink.c	Fri Dec 21 18:42:05 2001
+++ linux-2.4.17/net/core/rtnetlink.c	Fri Jan 11 18:20:40 2002
@@ -45,7 +45,6 @@
 #include <net/protocol.h>
 #include <net/arp.h>
 #include <net/route.h>
-#include <net/tcp.h>
 #include <net/udp.h>
 #include <net/sock.h>
 #include <net/pkt_sched.h>
diff -Nubr linux-2.4.17.orig/net/unix/af_unix.c 
linux-2.4.17/net/unix/af_unix.c
--- linux-2.4.17.orig/net/unix/af_unix.c	Fri Dec 21 18:42:06 2001
+++ linux-2.4.17/net/unix/af_unix.c	Fri Jan 11 18:23:05 2002
@@ -100,8 +100,8 @@
 #include <asm/uaccess.h>
 #include <linux/skbuff.h>
 #include <linux/netdevice.h>
+#include <linux/rtnetlink.h>
 #include <net/sock.h>
-#include <net/tcp.h>
 #include <net/af_unix.h>
 #include <linux/proc_fs.h>
 #include <net/scm.h>
diff -Nubr linux-2.4.17.orig/net/unix/garbage.c 
linux-2.4.17/net/unix/garbage.c
--- linux-2.4.17.orig/net/unix/garbage.c	Sat Jun 30 04:38:26 2001
+++ linux-2.4.17/net/unix/garbage.c	Fri Jan 11 18:37:55 2002
@@ -78,7 +78,6 @@
 #include <linux/proc_fs.h>

 #include <net/sock.h>
-#include <net/tcp.h>
 #include <net/af_unix.h>
 #include <net/scm.h>

Re: [PATCH] Briging doesn't compile without TCP/IP Networking

[David S. Miller]

   From: "ChristianK."@t-online.de (Christian Koenig)
   Date: Fri, 11 Jan 2002 18:46:25 +0100

   Check,this one is this better ?

Did you try to compile it? :-)  The net/unix/*.c parts
really do need TCP state definitions, so just changing
net/tcp.h to linux/tcp.h would be the fix in those parts.

I've done this and added it to my tree.
Thanks.