patch-2.3.99-pre7 linux/drivers/net/skfp/skfddi.c

• Lines: 19
• Date: Tue May 2 12:41:00 2000
• Orig file: v2.3.99-pre6/linux/drivers/net/skfp/skfddi.c
• Orig date: Tue Mar 14 19:10:39 2000

diff -u --recursive --new-file v2.3.99-pre6/linux/drivers/net/skfp/skfddi.c linux/drivers/net/skfp/skfddi.c
@@ -551,7 +551,7 @@
 	int len;
 
 	PRINTK(KERN_INFO "entering insert_device\n");
-	len = sizeof(struct net_device) + 8 + sizeof(struct s_smc);
+	len = sizeof(struct net_device) + sizeof(struct s_smc);
 	new = (struct net_device *) kmalloc(len, GFP_KERNEL);
 	if (new == NULL) {
 		printk("fddi%d: Device not initialised, insufficient memory\n",
@@ -559,8 +559,7 @@
 		return NULL;
 	} else {
 		memset((char *) new, 0, len);
-		new->name = (char *) (new + 1);
-		new->priv = (struct s_smc *) (new->name + 8);
+		new->priv = (struct s_smc *) (new + 1);
 		new->init = init;	/* initialisation routine */
 		if (!loading_module) {
 			new->next = dev->next;