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

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

diff -u --recursive --new-file v2.3.13/linux/drivers/net/declance.c linux/drivers/net/declance.c
@@ -262,7 +262,7 @@
 
 	unsigned short busmaster_regval;
 
-	struct device *dev;	/* Backpointer        */
+	struct net_device *dev;	/* Backpointer        */
 	struct lance_private *next_module;
 
 	/* Pointers to the ring buffers as seen from the CPU */
@@ -441,7 +441,7 @@
 
 /* Setup the Lance Rx and Tx rings */
 /* Sets dev->tbusy */
-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;
 	volatile struct lance_init_block *ib;
@@ -544,7 +544,7 @@
 	return 0;
 }
 
-static int lance_rx(struct device *dev)
+static int lance_rx(struct net_device *dev)
 {
 	struct lance_private *lp = (struct lance_private *) dev->priv;
 	volatile struct lance_init_block *ib;
@@ -626,7 +626,7 @@
 	return 0;
 }
 
-static int lance_tx(struct device *dev)
+static int lance_tx(struct net_device *dev)
 {
 	struct lance_private *lp = (struct lance_private *) dev->priv;
 	volatile struct lance_init_block *ib;
@@ -703,7 +703,7 @@
 
 static void lance_interrupt(const int irq, void *dev_id, struct pt_regs *regs)
 {
-	struct device *dev = (struct device *) dev_id;
+	struct net_device *dev = (struct net_device *) dev_id;
 	struct lance_private *lp = (struct lance_private *) dev->priv;
 	volatile struct lance_regs *ll = lp->ll;
 	int csr0;
@@ -765,9 +765,9 @@
 	dev->interrupt = 0;
 }
 
-struct device *last_dev = 0;
+struct net_device *last_dev = 0;
 
-static int lance_open(struct device *dev)
+static int lance_open(struct net_device *dev)
 {
 	struct lance_private *lp = (struct lance_private *) dev->priv;
 	volatile struct lance_regs *ll = lp->ll;
@@ -801,7 +801,7 @@
 	return status;
 }
 
-static int lance_close(struct device *dev)
+static int lance_close(struct net_device *dev)
 {
 	struct lance_private *lp = (struct lance_private *) dev->priv;
 	volatile struct lance_regs *ll = lp->ll;
@@ -820,7 +820,7 @@
 	return 0;
 }
 
-static inline int lance_reset(struct device *dev)
+static inline int lance_reset(struct net_device *dev)
 {
 	struct lance_private *lp = (struct lance_private *) dev->priv;
 	volatile struct lance_regs *ll = lp->ll;
@@ -843,7 +843,7 @@
 	return status;
 }
 
-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;
 	volatile struct lance_regs *ll = lp->ll;
@@ -912,14 +912,14 @@
 	return status;
 }
 
-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;
 
 	return &lp->stats;
 }
 
-static void lance_load_multicast(struct device *dev)
+static void lance_load_multicast(struct net_device *dev)
 {
 	volatile struct lance_init_block *ib = (struct lance_init_block *) (dev->mem_start);
 	volatile u16 *mcast_table = (u16 *) & ib->filter;
@@ -970,7 +970,7 @@
 	return;
 }
 
-static void lance_set_multicast(struct device *dev)
+static void lance_set_multicast(struct net_device *dev)
 {
 	struct lance_private *lp = (struct lance_private *) dev->priv;
 	volatile struct lance_init_block *ib;
@@ -1000,7 +1000,7 @@
 	dev->tbusy = 0;
 }
 
-__initfunc(static int dec_lance_init(struct device *dev, const int type))
+__initfunc(static int dec_lance_init(struct net_device *dev, const int type))
 {
 	static unsigned version_printed = 0;
 	struct lance_private *lp;
@@ -1194,7 +1194,7 @@
 
 
 /* Find all the lance cards on the system and initialize them */
-__initfunc(int dec_lance_probe(struct device *dev))
+__initfunc(int dec_lance_probe(struct net_device *dev))
 {
 	static int called = 0;