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

• Lines: 105
• Date: Wed Aug 18 11:36:43 1999
• Orig file: v2.3.13/linux/drivers/net/znet.c
• Orig date: Mon Aug 9 14:59:22 1999

diff -u --recursive --new-file v2.3.13/linux/drivers/net/znet.c linux/drivers/net/znet.c
@@ -180,15 +180,15 @@
 	char pad;
 };
 
-int znet_probe(struct device *dev);
-static int	znet_open(struct device *dev);
-static int	znet_send_packet(struct sk_buff *skb, struct device *dev);
+int znet_probe(struct net_device *dev);
+static int	znet_open(struct net_device *dev);
+static int	znet_send_packet(struct sk_buff *skb, struct net_device *dev);
 static void	znet_interrupt(int irq, void *dev_id, struct pt_regs *regs);
-static void	znet_rx(struct device *dev);
-static int	znet_close(struct device *dev);
-static struct net_device_stats *net_get_stats(struct device *dev);
-static void set_multicast_list(struct device *dev);
-static void hardware_init(struct device *dev);
+static void	znet_rx(struct net_device *dev);
+static int	znet_close(struct net_device *dev);
+static struct net_device_stats *net_get_stats(struct net_device *dev);
+static void set_multicast_list(struct net_device *dev);
+static void hardware_init(struct net_device *dev);
 static void update_stop_hit(short ioaddr, unsigned short rx_stop_offset);
 
 #ifdef notdef
@@ -200,7 +200,7 @@
    BIOS area.  We just scan for the signature, and pull the vital parameters
    out of the structure. */
 
-int __init znet_probe(struct device *dev)
+int __init znet_probe(struct net_device *dev)
 {
 	int i;
 	struct netidblk *netinfo;
@@ -283,7 +283,7 @@
 }
 
 
-static int znet_open(struct device *dev)
+static int znet_open(struct net_device *dev)
 {
 	int ioaddr = dev->base_addr;
 
@@ -314,7 +314,7 @@
 	return 0;
 }
 
-static int znet_send_packet(struct sk_buff *skb, struct device *dev)
+static int znet_send_packet(struct sk_buff *skb, struct net_device *dev)
 {
 	int ioaddr = dev->base_addr;
 	struct net_local *lp = (struct net_local *)dev->priv;
@@ -402,7 +402,7 @@
 /* The ZNET interrupt handler. */
 static void	znet_interrupt(int irq, void *dev_id, struct pt_regs * regs)
 {
-	struct device *dev = dev_id;
+	struct net_device *dev = dev_id;
 	int ioaddr;
 	int boguscnt = 20;
 
@@ -465,7 +465,7 @@
 	return;
 }
 
-static void znet_rx(struct device *dev)
+static void znet_rx(struct net_device *dev)
 {
 	struct net_local *lp = (struct net_local *)dev->priv;
 	int ioaddr = dev->base_addr;
@@ -589,7 +589,7 @@
 }
 
 /* The inverse routine to znet_open(). */
-static int znet_close(struct device *dev)
+static int znet_close(struct net_device *dev)
 {
 	unsigned long flags;
 	int ioaddr = dev->base_addr;
@@ -617,7 +617,7 @@
 
 /* Get the current statistics.	This may be called with the card open or
    closed. */
-static struct net_device_stats *net_get_stats(struct device *dev)
+static struct net_device_stats *net_get_stats(struct net_device *dev)
 {
 		struct net_local *lp = (struct net_local *)dev->priv;
 
@@ -632,7 +632,7 @@
    mode change persistent, but must be changed if this code is moved to
    a multiple adaptor environment.
  */
-static void set_multicast_list(struct device *dev)
+static void set_multicast_list(struct net_device *dev)
 {
 	short ioaddr = dev->base_addr;
 
@@ -677,7 +677,7 @@
 
 /* Initialize the hardware.  We have to do this when the board is open()ed
    or when we come out of suspend mode. */
-static void hardware_init(struct device *dev)
+static void hardware_init(struct net_device *dev)
 {
 	unsigned long flags;
 	short ioaddr = dev->base_addr;