patch-2.3.49 linux/drivers/net/pcmcia/aironet4500_cs.c

• Lines: 85
• Date: Mon Feb 28 07:16:54 2000
• Orig file: v2.3.48/linux/drivers/net/pcmcia/aironet4500_cs.c
• Orig date: Sun Feb 20 21:12:39 2000

diff -u --recursive --new-file v2.3.48/linux/drivers/net/pcmcia/aironet4500_cs.c linux/drivers/net/pcmcia/aironet4500_cs.c
@@ -112,13 +112,13 @@
    by the net software, because we only register already-found cards.
 */
 
-static int awc_pcmcia_init(struct NET_DEVICE *dev)
+static int awc_pcmcia_init(struct net_device *dev)
 {
 	return awc_init(dev);
 
 }
 
-static int awc_pcmcia_open(struct NET_DEVICE *dev)
+static int awc_pcmcia_open(struct net_device *dev)
 {
 	dev_link_t *link;
 	int status;
@@ -136,7 +136,7 @@
 	return status;
 }
 
-static int awc_pcmcia_close(struct NET_DEVICE *dev)
+static int awc_pcmcia_close(struct net_device *dev)
 {
 //	int ioaddr = dev->base_addr;
 	dev_link_t *link;
@@ -170,7 +170,7 @@
 {
 	client_reg_t client_reg;
 	dev_link_t *link = NULL;
-	struct NET_DEVICE *dev = NULL;
+	struct net_device *dev = NULL;
 	int  ret;
 
 	PC_DEBUG(0, "awc_attach()\n");
@@ -199,8 +199,8 @@
 
 	/* Create the network device object. */
 
-	dev = kmalloc(sizeof(struct NET_DEVICE ), GFP_KERNEL);
-	memset(dev,0,sizeof(struct NET_DEVICE));
+	dev = kmalloc(sizeof(struct net_device ), GFP_KERNEL);
+	memset(dev,0,sizeof(struct net_device));
 //	dev =  init_etherdev(0, sizeof(struct awc_private) );
 	if (!dev ) {
 		printk(KERN_CRIT "out of mem on dev alloc \n");
@@ -321,10 +321,10 @@
 	}
 	
 	if (link->priv) {
-		//struct NET_DEVICE *dev = link->priv;
+		//struct net_device *dev = link->priv;
 		// dam dam damn mif (dev->priv)
 		//	kfree_s(dev->priv, sizeof(struct awc_private));
-		kfree_s(link->priv, sizeof(struct NET_DEVICE));
+		kfree_s(link->priv, sizeof(struct net_device));
 	}
 	kfree_s(link->dev, sizeof(struct dev_node_t));
 	kfree_s(link, sizeof(struct dev_link_t));
@@ -345,7 +345,7 @@
 static void awc_pcmcia_config(dev_link_t *link)
 {
 	client_handle_t handle;
-	struct NET_DEVICE *dev;
+	struct net_device *dev;
 	struct awc_private *lp;
 	tuple_t tuple;
 	int ii;
@@ -520,7 +520,7 @@
 static void awc_release(u_long arg)
 {
 	dev_link_t *link = (dev_link_t *)arg;
-	struct NET_DEVICE *dev = link->priv;
+	struct net_device *dev = link->priv;
 
 	DEBUG(0, "awc_release(0x%p)\n", link);
 
@@ -558,7 +558,7 @@
 					   event_callback_args_t *args)
 {
 	dev_link_t *link = args->client_data;
-	struct NET_DEVICE *dev = link->priv;
+	struct net_device *dev = link->priv;
 
 	PC_DEBUG(1, "awc_event(0x%06x)\n", event);