patch-2.0.35 linux/net/netsyms.c

Next file: linux/net/protocols.c
Previous file: linux/net/netrom/sysctl_net_netrom.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.0.34/linux/net/netsyms.c linux/net/netsyms.c
@@ -15,10 +15,6 @@
 #include <linux/ioport.h>
 #include <net/sock.h>
 
-#ifdef CONFIG_AX25
-#include <net/ax25.h>
-#endif
-
 #ifdef CONFIG_INET
 #include <linux/ip.h>
 #include <linux/etherdevice.h>
@@ -30,6 +26,7 @@
 #include <net/icmp.h>
 #include <net/route.h>
 #include <linux/net_alias.h>
+#include <linux/inet.h>
 #endif
 
 #ifdef CONFIG_NETLINK
@@ -44,7 +41,7 @@
         defined(CONFIG_EL2)     ||      defined(CONFIG_NE2000)          || \
         defined(CONFIG_E2100)   ||      defined(CONFIG_HPLAN_PLUS)      || \
         defined(CONFIG_HPLAN)   ||      defined(CONFIG_AC3200)		|| \
-	defined(CONFIG_ULTRA32)
+	defined(CONFIG_ULTRA32) ||	defined(CONFIG_NE2K_PCI)
 #include "../drivers/net/8390.h"
 #endif
 
@@ -119,7 +116,7 @@
 	defined(CONFIG_EL2)	||	defined(CONFIG_NE2000)		|| \
 	defined(CONFIG_E2100)	||	defined(CONFIG_HPLAN_PLUS)	|| \
 	defined(CONFIG_HPLAN)	||	defined(CONFIG_AC3200)		|| \
-	defined(CONFIG_ULTRA32)
+	defined(CONFIG_ULTRA32)	||	defined(CONFIG_NE2K_PCI)
 	/* If 8390 NIC support is built in, we will need these. */
 	X(ei_open),
 	X(ei_close),
@@ -150,10 +147,6 @@
 #endif
 
         /* support for loadable net drivers */
-#ifdef CONFIG_AX25
-	X(ax25_encapsulate),
-	X(ax25_rebuild_header),
-#endif
 #ifdef CONFIG_INET
 	X(register_netdev),
 	X(unregister_netdev),
@@ -164,9 +157,11 @@
 	X(alloc_skb),
 	X(kfree_skb),
 	X(skb_clone),
+	X(skb_copy),
 	X(dev_alloc_skb),
 	X(dev_kfree_skb),
 	X(skb_device_unlock),
+	X(skb_device_locked),
 	X(netif_rx),
 	X(dev_tint),
 	X(irq2dev_map),
@@ -183,6 +178,10 @@
 	X(tty_register_ldisc),
 	X(kill_fasync),
 	X(arp_query),
+	X(ip_rcv),
+	X(arp_rcv),
+	X(in_aton),
+	X(in_ntoa),
 #endif  /* CONFIG_INET */
 
 #ifdef CONFIG_NETLINK

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov