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

• Lines: 135
• Date: Wed Aug 18 11:36:41 1999
• Orig file: v2.3.13/linux/drivers/net/bagetlance.c
• Orig date: Wed Jun 30 13:38:20 1999

diff -u --recursive --new-file v2.3.13/linux/drivers/net/bagetlance.c linux/drivers/net/bagetlance.c
@@ -329,17 +329,17 @@
 
 static int addr_accessible( volatile void *regp, int wordflag, int
                             writeflag );
-static unsigned long lance_probe1( struct device *dev, struct lance_addr
+static unsigned long lance_probe1( struct net_device *dev, struct lance_addr
                                    *init_rec );
-static int lance_open( struct device *dev );
-static void lance_init_ring( struct device *dev );
-static int lance_start_xmit( struct sk_buff *skb, struct device *dev );
+static int lance_open( struct net_device *dev );
+static void lance_init_ring( struct net_device *dev );
+static int lance_start_xmit( struct sk_buff *skb, struct net_device *dev );
 static void lance_interrupt( int irq, void *dev_id, struct pt_regs *fp );
-static int lance_rx( struct device *dev );
-static int lance_close( struct device *dev );
-static struct net_device_stats *lance_get_stats( struct device *dev );
-static void set_multicast_list( struct device *dev );
-static int lance_set_mac_address( struct device *dev, void *addr );
+static int lance_rx( struct net_device *dev );
+static int lance_close( struct net_device *dev );
+static struct net_device_stats *lance_get_stats( struct net_device *dev );
+static void set_multicast_list( struct net_device *dev );
+static int lance_set_mac_address( struct net_device *dev, void *addr );
 
 /************************* End of Prototypes **************************/
 
@@ -469,7 +469,7 @@
 }
 
 
-__initfunc(int bagetlance_probe( struct device *dev ))
+__initfunc(int bagetlance_probe( struct net_device *dev ))
 
 {	int i;
 	static int found = 0;
@@ -508,7 +508,7 @@
 #define IRQ_TYPE_PRIO SA_INTERRUPT
 #define IRQ_SOURCE_TO_VECTOR(x) (x)
 
-__initfunc(static unsigned long lance_probe1( struct device *dev,
+__initfunc(static unsigned long lance_probe1( struct net_device *dev,
 								   struct lance_addr *init_rec ))
 
 {	volatile unsigned short *memaddr =
@@ -723,7 +723,7 @@
 }
 
 
-static int lance_open( struct device *dev )
+static int lance_open( struct net_device *dev )
 
 {	struct lance_private *lp = (struct lance_private *)dev->priv;
 	struct lance_ioreg	 *IO = lp->iobase;
@@ -767,7 +767,7 @@
 
 /* Initialize the LANCE Rx and Tx rings. */
 
-static void lance_init_ring( struct device *dev )
+static void lance_init_ring( struct net_device *dev )
 
 {	struct lance_private *lp = (struct lance_private *)dev->priv;
 	int i;
@@ -823,7 +823,7 @@
 }
 
 
-static int lance_start_xmit( struct sk_buff *skb, struct device *dev )
+static int lance_start_xmit( struct sk_buff *skb, struct net_device *dev )
 
 {	struct lance_private *lp = (struct lance_private *)dev->priv;
 	struct lance_ioreg	 *IO = lp->iobase;
@@ -962,7 +962,7 @@
 
 static void lance_interrupt( int irq, void *dev_id, struct pt_regs *fp)
 {
-	struct device *dev = dev_id;
+	struct net_device *dev = dev_id;
 	struct lance_private *lp;
 	struct lance_ioreg	 *IO;
 	int csr0, boguscnt = 10;
@@ -1082,7 +1082,7 @@
 }
 
 
-static int lance_rx( struct device *dev )
+static int lance_rx( struct net_device *dev )
 
 {	struct lance_private *lp = (struct lance_private *)dev->priv;
 	int entry = lp->cur_rx & RX_RING_MOD_MASK;
@@ -1205,7 +1205,7 @@
 }
 
 
-static int lance_close( struct device *dev )
+static int lance_close( struct net_device *dev )
 
 {	struct lance_private *lp = (struct lance_private *)dev->priv;
 	struct lance_ioreg	 *IO = lp->iobase;
@@ -1227,7 +1227,7 @@
 }
 
 
-static struct net_device_stats *lance_get_stats( struct device *dev )
+static struct net_device_stats *lance_get_stats( struct net_device *dev )
 
 {	
 	struct lance_private *lp = (struct lance_private *)dev->priv;
@@ -1242,7 +1242,7 @@
 						best-effort filtering.
  */
 
-static void set_multicast_list( struct device *dev )
+static void set_multicast_list( struct net_device *dev )
 
 {	struct lance_private *lp = (struct lance_private *)dev->priv;
 	struct lance_ioreg	 *IO = lp->iobase;
@@ -1284,7 +1284,7 @@
 
 /* This is needed for old RieblCards and possible for new RieblCards */
 
-static int lance_set_mac_address( struct device *dev, void *addr )
+static int lance_set_mac_address( struct net_device *dev, void *addr )
 
 {	struct lance_private *lp = (struct lance_private *)dev->priv;
 	struct sockaddr *saddr = addr;
@@ -1326,7 +1326,7 @@
 #ifdef MODULE
 static char devicename[9] = { 0, };
 
-static struct device bagetlance_dev =
+static struct net_device bagetlance_dev =
 {
 	devicename,	/* filled in by register_netdev() */
 	0, 0, 0, 0,	/* memory */