patch-1.3.95 linux/drivers/net/ewrk3.c

• Lines: 32
• Date: Tue Apr 23 09:22:01 1996
• Orig file: v1.3.94/linux/drivers/net/ewrk3.c
• Orig date: Wed Mar 6 15:04:20 1996

diff -u --recursive --new-file v1.3.94/linux/drivers/net/ewrk3.c linux/drivers/net/ewrk3.c
@@ -132,11 +132,12 @@
 			  Add new multicasting code.
       0.41    20-Jan-96   Fix IRQ set up problem reported by 
                           <kenneth@bbs.sas.ntu.ac.sg>.
+      0.42    22-Apr-96	  Fix alloc_device() bug <jari@markkus2.fimr.fi>
 
     =========================================================================
 */
 
-static const char *version = "ewrk3.c:v0.41 96/1/20 davies@wanton.lkg.dec.com\n";
+static const char *version = "ewrk3.c:v0.42 96/4/22 davies@wanton.lkg.dec.com\n";
 
 #include <linux/module.h>
 
@@ -1415,7 +1416,7 @@
 	** and initialize it (name, I/O address, next device (NULL) and
 	** initialisation probe routine).
 	*/
-	dev->name = (char *)(dev + sizeof(struct device));
+	dev->name = (char *)(dev + 1);
 	if (num_eth > 9999) {
 	  sprintf(dev->name,"eth????");    /* New device name */
 	} else {
@@ -1454,7 +1455,7 @@
 	    ** and initialize it (name, I/O address, next device (NULL) and
 	    ** initialisation probe routine).
 	    */
-	    tmp->name = (char *)(tmp + sizeof(struct device));
+	    tmp->name = (char *)(tmp + 1);
 	    if (num_eth > 9999) {
 	      sprintf(tmp->name,"eth????");       /* New device name */
 	    } else {