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

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

diff -u --recursive --new-file v2.3.13/linux/drivers/net/sgiseeq.c linux/drivers/net/sgiseeq.c
@@ -134,7 +134,7 @@
 	hregs->rx_ctrl = HPC3_ERXCTRL_ACTIVE;
 }
 
-static inline void seeq_load_eaddr(struct device *dev,
+static inline void seeq_load_eaddr(struct net_device *dev,
 				   volatile struct sgiseeq_regs *sregs)
 {
 	int i;
@@ -148,7 +148,7 @@
 #define RCNTCFG_INIT  (HPCDMA_OWN | HPCDMA_EORP | HPCDMA_XIE)
 #define RCNTINFO_INIT (RCNTCFG_INIT | (PKT_BUF_SZ & HPCDMA_BCNT))
 
-static void seeq_init_ring(struct device *dev)
+static void seeq_init_ring(struct net_device *dev)
 {
 	struct sgiseeq_private *sp = (struct sgiseeq_private *) dev->priv;
 	volatile struct sgiseeq_init_block *ib = &sp->srings;
@@ -196,7 +196,7 @@
 
 #ifdef DEBUG
 static struct sgiseeq_private *gpriv;
-static struct device *gdev;
+static struct net_device *gdev;
 
 void sgiseeq_dump_rings(void)
 {
@@ -241,7 +241,7 @@
 #define TSTAT_INIT_EDLC ((TSTAT_INIT_SEEQ) | SEEQ_TCMD_RB2)
 #define RDMACFG_INIT    (HPC3_ERXDCFG_FRXDC | HPC3_ERXDCFG_FEOP | HPC3_ERXDCFG_FIRQ)
 
-static void init_seeq(struct device *dev, struct sgiseeq_private *sp,
+static void init_seeq(struct net_device *dev, struct sgiseeq_private *sp,
 		      volatile struct sgiseeq_regs *sregs)
 {
 	volatile struct hpc3_ethregs *hregs = sp->hregs;
@@ -294,7 +294,7 @@
 				!((rd)->rdma.cntinfo & HPCDMA_OWN); \
 				(rd) = &(sp)->srings.rx_desc[(sp)->rx_new])
 
-static inline void sgiseeq_rx(struct device *dev, struct sgiseeq_private *sp,
+static inline void sgiseeq_rx(struct net_device *dev, struct sgiseeq_private *sp,
 			      volatile struct hpc3_ethregs *hregs,
 			      volatile struct sgiseeq_regs *sregs)
 {
@@ -371,7 +371,7 @@
 	}
 }
 
-static inline void sgiseeq_tx(struct device *dev, struct sgiseeq_private *sp,
+static inline void sgiseeq_tx(struct net_device *dev, struct sgiseeq_private *sp,
 			      volatile struct hpc3_ethregs *hregs,
 			      volatile struct sgiseeq_regs *sregs)
 {
@@ -412,7 +412,7 @@
 }
 
 static inline void tx_maybe_unbusy(struct sgiseeq_private *sp,
-				   struct device *dev)
+				   struct net_device *dev)
 {
 	if((TX_BUFFS_AVAIL(sp) >= 0) && dev->tbusy) {
 		dev->tbusy = 0;
@@ -422,7 +422,7 @@
 
 static void sgiseeq_interrupt(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 sgiseeq_private *sp = (struct sgiseeq_private *) dev->priv;
 	volatile struct hpc3_ethregs *hregs = sp->hregs;
 	volatile struct sgiseeq_regs *sregs = sp->sregs;
@@ -442,7 +442,7 @@
 	dev->interrupt = 0;
 }
 
-static int sgiseeq_open(struct device *dev)
+static int sgiseeq_open(struct net_device *dev)
 {
 	struct sgiseeq_private *sp = (struct sgiseeq_private *)dev->priv;
 	volatile struct sgiseeq_regs *sregs = sp->sregs;
@@ -464,7 +464,7 @@
 	return 0;
 }
 
-static int sgiseeq_close(struct device *dev)
+static int sgiseeq_close(struct net_device *dev)
 {
 	struct sgiseeq_private *sp = (struct sgiseeq_private *) dev->priv;
 	volatile struct sgiseeq_regs *sregs = sp->sregs;
@@ -480,7 +480,7 @@
 	return 0;
 }
 
-static inline int sgiseeq_reset(struct device *dev)
+static inline int sgiseeq_reset(struct net_device *dev)
 {
 	struct sgiseeq_private *sp = (struct sgiseeq_private *) dev->priv;
 	volatile struct sgiseeq_regs *sregs = sp->sregs;
@@ -502,7 +502,7 @@
 }
 
 static inline int verify_tx(struct sgiseeq_private *sp,
-			    struct device *dev,
+			    struct net_device *dev,
 			    struct sk_buff *skb)
 {
 	/* Are we bolixed? */
@@ -529,7 +529,7 @@
 	return 0;
 }
 
-static int sgiseeq_start_xmit(struct sk_buff *skb, struct device *dev)
+static int sgiseeq_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
 	struct sgiseeq_private *sp = (struct sgiseeq_private *) dev->priv;
 	volatile struct hpc3_ethregs *hregs = sp->hregs;
@@ -585,14 +585,14 @@
 	return 0;
 }
 
-static struct enet_statistics *sgiseeq_get_stats(struct device *dev)
+static struct enet_statistics *sgiseeq_get_stats(struct net_device *dev)
 {
 	struct sgiseeq_private *sp = (struct sgiseeq_private *) dev->priv;
 
 	return &sp->stats;
 }
 
-static void sgiseeq_set_multicast(struct device *dev)
+static void sgiseeq_set_multicast(struct net_device *dev)
 {
 }
 
@@ -625,7 +625,7 @@
 
 #define ALIGNED(x)  ((((unsigned long)(x)) + 0xf) & ~(0xf))
 
-int sgiseeq_init(struct device *dev, struct sgiseeq_regs *sregs,
+int sgiseeq_init(struct net_device *dev, struct sgiseeq_regs *sregs,
 		 struct hpc3_ethregs *hregs, int irq)
 {
 	static unsigned version_printed = 0;
@@ -721,7 +721,7 @@
 	}
 }
 
-int sgiseeq_probe(struct device *dev)
+int sgiseeq_probe(struct net_device *dev)
 {
 	static int initialized;
 	char *ep;