patch-2.3.14 linux/drivers/net/wavelan.c

• Lines: 43
• Date: Wed Aug 18 11:36:43 1999
• Orig file: v2.3.13/linux/drivers/net/wavelan.c
• Orig date: Thu Jul 8 15:42:20 1999

diff -u --recursive --new-file v2.3.13/linux/drivers/net/wavelan.c linux/drivers/net/wavelan.c
@@ -1876,7 +1876,7 @@
  * It is here that the wireless extensions are treated (iwconfig).
  */
 static int
-wavelan_ioctl(struct device *	dev,	/* device on which the ioctl is applied */
+wavelan_ioctl(struct net_device *	dev,	/* device on which the ioctl is applied */
 	      struct ifreq *	rq,	/* data passed */
 	      int		cmd)	/* ioctl number */
 {
@@ -4239,13 +4239,13 @@
 	  device *	dev;
 
 	  /* Create device and set basic arguments. */
-	  dev = kmalloc(sizeof(struct device), GFP_KERNEL);
+	  dev = kmalloc(sizeof(struct net_device), GFP_KERNEL);
 	  if(dev==NULL)
 	  {
 	  	ret = -ENOMEM;
 	  	break;
 	  }
-	  memset(dev, 0x00, sizeof(struct device));
+	  memset(dev, 0x00, sizeof(struct net_device));
 	  dev->name = name[i];
 	  dev->base_addr = io[i];
 	  dev->irq = irq[i];
@@ -4257,7 +4257,7 @@
 	    {
 	      /* Deallocate everything. */
 	      /* Note: if dev->priv is mallocated, there is no way to fail. */
-	      kfree_s(dev, sizeof(struct device));
+	      kfree_s(dev, sizeof(struct net_device));
 	    }
 	  else
 	    {
@@ -4310,7 +4310,7 @@
 
       /* Free pieces. */
       kfree_s(dev->priv, sizeof(struct net_local));
-      kfree_s(dev, sizeof(struct device));
+      kfree_s(dev, sizeof(struct net_device));
     }
 
 #ifdef DEBUG_MODULE_TRACE