[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git-commits-head
Subject:    Merge bk://kernel.bkbits.net/acme/netsyms-2.6
From:       Linux Kernel Mailing List <linux-kernel () vger ! kernel ! org>
Date:       2003-09-30 11:41:04
[Download RAW message or body]

ChangeSet 1.1429, 2003/09/30 04:41:04-07:00, davem@nuts.ninka.net

	Merge bk://kernel.bkbits.net/acme/netsyms-2.6
	into nuts.ninka.net:/disk1/davem/BK/net-2.5


# This patch includes the following deltas:
#	           ChangeSet	1.1428+1.1375.5.10 -> 1.1429 
#	 drivers/net/Space.c	1.39.1.1 -> 1.41   
#	      net/ipv4/arp.c	1.30.1.2 -> 1.32   
#

 drivers/net/Space.c |    4 ----
 net/ipv4/arp.c      |   11 +++++++++++
 2 files changed, 11 insertions(+), 4 deletions(-)


diff -Nru a/drivers/net/Space.c b/drivers/net/Space.c
--- a/drivers/net/Space.c	Tue Sep 30 09:11:55 2003
+++ b/drivers/net/Space.c	Tue Sep 30 09:11:55 2003
@@ -67,7 +67,6 @@
 extern int ac3200_probe(struct net_device *);
 extern int es_probe(struct net_device *);
 extern int lne390_probe(struct net_device *);
-extern int ne3210_probe(struct net_device *);
 extern int e2100_probe(struct net_device *);
 extern int ni5010_probe(struct net_device *);
 extern int ni52_probe(struct net_device *);
@@ -154,9 +153,6 @@
 #endif
 #ifdef CONFIG_LNE390
 	{lne390_probe, 0},
-#endif
-#ifdef CONFIG_NE3210
-	{ne3210_probe, 0},
 #endif
 	{NULL, 0},
 };
diff -Nru a/net/ipv4/arp.c b/net/ipv4/arp.c
--- a/net/ipv4/arp.c	Tue Sep 30 09:11:55 2003
+++ b/net/ipv4/arp.c	Tue Sep 30 09:11:55 2003
@@ -69,6 +69,7 @@
  *		Arnaldo C. Melo :	convert /proc/net/arp to seq_file
  */
 
+#include <linux/module.h>
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/kernel.h>
@@ -1430,3 +1431,13 @@
 }
 
 #endif /* CONFIG_PROC_FS */
+
+EXPORT_SYMBOL(arp_broken_ops);
+EXPORT_SYMBOL(arp_find);
+EXPORT_SYMBOL(arp_rcv);
+EXPORT_SYMBOL(arp_send);
+EXPORT_SYMBOL(arp_tbl);
+
+#if defined(CONFIG_ATM_CLIP) || defined(CONFIG_ATM_CLIP_MODULE)
+EXPORT_SYMBOL(clip_tbl_hook);
+#endif
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]