patch-2.4.0-test10 linux/drivers/net/eth16i.c

Next file: linux/drivers/net/fmv18x.c
Previous file: linux/drivers/net/es3210.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test9/linux/drivers/net/eth16i.c linux/drivers/net/eth16i.c
@@ -484,7 +484,6 @@
 	  */
 
 	if(ioaddr < 0x1000) {
-	
 		if(eth16i_portlist[(inb(ioaddr + JUMPERLESS_CONFIG) & 0x07)] 
 		   != ioaddr)
 			return -ENODEV;
@@ -509,9 +508,6 @@
 	outb(0x00, ioaddr + RESET);             /* Reset some parts of chip */
 	BITSET(ioaddr + CONFIG_REG_0, BIT(7));  /* Disable the data link */
 
-	if(dev == NULL)
-		dev = init_etherdev(0, 0);
-
 	if( (eth16i_debug & version_printed++) == 0)
 		printk(KERN_INFO "%s", version);
 
@@ -1392,20 +1388,12 @@
 
 #define MAX_ETH16I_CARDS 4  /* Max number of Eth16i cards per module */
 
-static struct net_device dev_eth16i[MAX_ETH16I_CARDS] = {
-	{
-		"",
-		0, 0, 0, 0,
-		0, 0,
-		0, 0, 0, NULL, NULL
-	},
-};
-
-static int io[MAX_ETH16I_CARDS] = { 0, };
+static struct net_device dev_eth16i[MAX_ETH16I_CARDS];
+static int io[MAX_ETH16I_CARDS];
 #if 0
-static int irq[MAX_ETH16I_CARDS] = { 0, };
+static int irq[MAX_ETH16I_CARDS];
 #endif
-static char* mediatype[MAX_ETH16I_CARDS] = { 0, };
+static char* mediatype[MAX_ETH16I_CARDS];
 static int debug = -1;
 
 #if (LINUX_VERSION_CODE >= 0x20115) 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)