[LV-kern-commit] CVS: kernel-2.4/net/ethernet Makefile,1.1.1.1,1.2 eth.c,1.1.1.1,1.2

[Andy P. <at...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/net/ethernet
In directory usw-pr-cvs1:/tmp/cvs-serv30993/ethernet

Modified Files:
	Makefile eth.c 
Log Message:
synch 2.4.15 commit 19


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/net/ethernet/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- Makefile	14 Jan 2001 17:08:11 -0000	1.1.1.1
+++ Makefile	9 Apr 2002 16:22:03 -0000	1.2
@@ -26,6 +26,3 @@
 obj-$(CONFIG_NET)	:= $(OBJS) $(OBJ2)
 
 include $(TOPDIR)/Rules.make
-
-tar:
-	tar -cvf /dev/f1 .

Index: eth.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/net/ethernet/eth.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- eth.c	14 Jan 2001 17:08:12 -0000	1.1.1.1
+++ eth.c	9 Apr 2002 16:22:03 -0000	1.2
@@ -30,6 +30,7 @@
  *		Alan Cox	: Protect against forwarding explosions with
  *				  older network drivers and IFF_ALLMULTI.
  *	Christer Weinigel	: Better rebuild header message.
+ *             Andrew Morton    : 26Feb01: kill ether_setup() - use netdev_boot_setup().
  *
  *		This program is free software; you can redistribute it and/or
  *		modify it under the terms of the GNU General Public License
@@ -60,31 +61,9 @@
 #include <asm/system.h>
 #include <asm/checksum.h>
 
-static int __init eth_setup(char *str)
-{
-	int ints[5];
-	struct ifmap map;
+extern int __init netdev_boot_setup(char *str);
 
-	str = get_options(str, ARRAY_SIZE(ints), ints);
-	if (!str || !*str)
-		return 0;
-
- 	/* Save settings */
- 	memset(&map, -1, sizeof(map));
-	if (ints[0] > 0)
-		map.irq = ints[1];
-	if (ints[0] > 1)
-		map.base_addr = ints[2];
-	if (ints[0] > 2)
-		map.mem_start = ints[3];
-	if (ints[0] > 3)
-		map.mem_end = ints[4];
-
-	/* Add new entry to the list */
-	return netdev_boot_setup_add(str, &map);
-}
-
-__setup("ether=", eth_setup);
+__setup("ether=", netdev_boot_setup);
 
 /*
  *	 Create the Ethernet MAC header for an arbitrary protocol layer