patch-2.1.101 linux/drivers/ap1000/apfddi.c

Next file: linux/drivers/ap1000/bif.c
Previous file: linux/drivers/acorn/scsi/queue.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.100/linux/drivers/ap1000/apfddi.c linux/drivers/ap1000/apfddi.c
@@ -488,6 +488,13 @@
 int apfddi_init(struct device *dev)
 {
     int i;
+
+    /*
+     * Check if this thing has already been initialised.
+     */
+    if (apfddi_device != NULL)
+	return -ENODEV;
+
     printk("apfddi_init(): Initialising fddi interface\n");
 
     apfddi_device = dev;
@@ -523,12 +530,6 @@
 
     memset(dev->broadcast, 0xFF, ETH_ALEN);
     
-    dev->family = AF_INET;
-    dev->pa_addr = in_aton("150.203.142.28");  /* hibana-f */
-    dev->pa_mask = in_aton("255.255.255.0");
-    dev->pa_brdaddr = dev->pa_addr | ~dev->pa_mask;
-    dev->pa_alen = 4;
-
     return(0);
 }
 

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