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

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

diff -u --recursive --new-file v2.3.13/linux/drivers/net/hydra.c linux/drivers/net/hydra.c
@@ -90,14 +90,14 @@
 	unsigned int key;
 };
 
-static int hydra_open(struct device *dev);
-static int hydra_start_xmit(struct sk_buff *skb, struct device *dev);
+static int hydra_open(struct net_device *dev);
+static int hydra_start_xmit(struct sk_buff *skb, struct net_device *dev);
 static void hydra_interrupt(int irq, void *data, struct pt_regs *fp);
-static void __inline__ hydra_rx(struct device *dev, struct hydra_private *priv, volatile u8 *nicbase);
-static int hydra_close(struct device *dev);
-static struct net_device_stats *hydra_get_stats(struct device *dev);
+static void __inline__ hydra_rx(struct net_device *dev, struct hydra_private *priv, volatile u8 *nicbase);
+static int hydra_close(struct net_device *dev);
+static struct net_device_stats *hydra_get_stats(struct net_device *dev);
 #ifdef HAVE_MULTICAST
-static void set_multicast_list(struct device *dev, int num_addrs, void *addrs);
+static void set_multicast_list(struct net_device *dev, int num_addrs, void *addrs);
 #endif
 
 
@@ -157,7 +157,7 @@
 
 #endif
 
-int __init hydra_probe(struct device *dev)
+int __init hydra_probe(struct net_device *dev)
 {
 	struct hydra_private *priv;
 	u32 board;
@@ -210,7 +210,7 @@
 }
 
 
-static int hydra_open(struct device *dev)
+static int hydra_open(struct net_device *dev)
 {
 	struct hydra_private *priv = (struct hydra_private *)dev->priv;
 	volatile u8 *nicbase = priv->hydra_nic_base;
@@ -282,7 +282,8 @@
 	dev->interrupt = 0;
 	dev->start = 1;
     
-	if(request_irq(IRQ_AMIGA_PORTS, hydra_interrupt, 0, "Hydra Ethernet", dev))
+	if(request_irq(IRQ_AMIGA_PORTS, hydra_interrupt, SA_SHIRQ,
+		       "Hydra Ethernet", dev))
 		return(-EAGAIN);
 
 	MOD_INC_USE_COUNT;
@@ -291,7 +292,7 @@
 }
 
 
-static int hydra_close(struct device *dev)
+static int hydra_close(struct net_device *dev)
 {
 	struct hydra_private *priv = (struct hydra_private *)dev->priv;
 	volatile u8 *nicbase = priv->hydra_nic_base;
@@ -322,7 +323,7 @@
 {
 	volatile u8 *nicbase;
   
-	struct device *dev = (struct device *) data;
+	struct net_device *dev = (struct net_device *) data;
 	struct hydra_private *priv;
 	u16 intbits;
 
@@ -433,7 +434,7 @@
  * packet transmit routine
  */
 
-static int hydra_start_xmit(struct sk_buff *skb, struct device *dev)
+static int hydra_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
 	struct hydra_private *priv = (struct hydra_private *)dev->priv;
 	volatile u8 *nicbase = priv->hydra_nic_base;
@@ -524,7 +525,7 @@
 }
 
 
-static void __inline__ hydra_rx(struct device *dev, struct hydra_private *priv, volatile u8 *nicbase)
+static void __inline__ hydra_rx(struct net_device *dev, struct hydra_private *priv, volatile u8 *nicbase)
 {
 	volatile u16 *board_ram_ptr;
 	struct sk_buff *skb;
@@ -633,7 +634,7 @@
 }
     
 
-static struct net_device_stats *hydra_get_stats(struct device *dev)
+static struct net_device_stats *hydra_get_stats(struct net_device *dev)
 {
 	struct hydra_private *priv = (struct hydra_private *)dev->priv;
 #if 0
@@ -647,7 +648,7 @@
 }
 
 #ifdef HAVE_MULTICAST
-static void set_multicast_list(struct device *dev, int num_addrs, void *addrs)
+static void set_multicast_list(struct net_device *dev, int num_addrs, void *addrs)
 {
 	struct hydra_private *priv = (struct hydra_private *)dev->priv;
 	u8 *board = priv->hydra_base;
@@ -662,7 +663,7 @@
 #ifdef MODULE
 static char devicename[9] = { 0, };
 
-static struct device hydra_dev =
+static struct net_device hydra_dev =
 {
 	devicename,			/* filled in by register_netdev() */
 	0, 0, 0, 0,			/* memory */