patch-2.1.67 linux/drivers/net/ipddp.c

• Lines: 27
• Date: Sat Nov 29 10:33:19 1997
• Orig file: v2.1.66/linux/drivers/net/ipddp.c
• Orig date: Tue Sep 23 16:48:48 1997

diff -u --recursive --new-file v2.1.66/linux/drivers/net/ipddp.c linux/drivers/net/ipddp.c
@@ -1,3 +1,5 @@
+#warning "Needs new networking merges before it will work"
+#if 0
 /*
  *	ipddp.c: IP-over-DDP driver for Linux
  *
@@ -46,6 +48,7 @@
 #include <asm/dma.h>
 #include <linux/errno.h>
 #include <linux/netdevice.h>
+#include <linux/inetdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 #include <linux/if_arp.h>
@@ -118,7 +121,6 @@
 	dev->rebuild_header = ipddp_rebuild_header;
 
         dev->type = ARPHRD_IPDDP;       	/* IP over DDP tunnel */
-        dev->family = AF_INET;
         dev->mtu = 585;
         dev->flags |= IFF_NOARP;
 
@@ -307,3 +309,4 @@
 }
 
 #endif /* MODULE */
+#endif