patch-2.3.14 linux/drivers/net/irda/uircc.c

• Lines: 57
• Date: Wed Aug 18 11:38:51 1999
• Orig file: v2.3.13/linux/drivers/net/irda/uircc.c
• Orig date: Thu Jul 8 15:42:20 1999

diff -u --recursive --new-file v2.3.13/linux/drivers/net/irda/uircc.c linux/drivers/net/irda/uircc.c
@@ -71,16 +71,16 @@
 static int  uircc_probe(int iobase, int board_addr, int irq, int dma);
 static int  uircc_dma_receive(struct irda_device *idev); 
 static int  uircc_dma_receive_complete(struct irda_device *idev, int iobase);
-static int  uircc_hard_xmit(struct sk_buff *skb, struct device *dev);
+static int  uircc_hard_xmit(struct sk_buff *skb, struct net_device *dev);
 static void uircc_dma_write(struct irda_device *idev, int iobase);
 static void uircc_change_speed(struct irda_device *idev, int baud);
 static void uircc_interrupt(int irq, void *dev_id, struct pt_regs *regs);
 static void uircc_wait_until_sent(struct irda_device *idev);
 static int  uircc_is_receiving(struct irda_device *idev);
 static int uircc_toshiba_cmd(int *retval, int arg0, int arg1, int arg2);
-static int  uircc_net_init(struct device *dev);
-static int  uircc_net_open(struct device *dev);
-static int  uircc_net_close(struct device *dev);
+static int  uircc_net_init(struct net_device *dev);
+static int  uircc_net_open(struct net_device *dev);
+static int  uircc_net_close(struct net_device *dev);
 
 /*
  * Function uircc_init ()
@@ -406,7 +406,7 @@
  *    Transmit the frame!
  *
  */
-static int uircc_hard_xmit(struct sk_buff *skb, struct device *dev)
+static int uircc_hard_xmit(struct sk_buff *skb, struct net_device *dev)
 {
 	struct irda_device *idev;
 	int iobase;
@@ -798,7 +798,7 @@
  *    Initialize network device
  *
  */
-static int uircc_net_init( struct device *dev)
+static int uircc_net_init( struct net_device *dev)
 {
 	DEBUG( 4, __FUNCTION__ "()\n");
 
@@ -817,7 +817,7 @@
  *    Start the device
  *
  */
-static int uircc_net_open(struct device *dev)
+static int uircc_net_open(struct net_device *dev)
 {
 	struct irda_device *idev;
 	int iobase;
@@ -863,7 +863,7 @@
  *    Stop the device
  *
  */
-static int uircc_net_close(struct device *dev)
+static int uircc_net_close(struct net_device *dev)
 {
 	struct irda_device *idev;
 	int iobase;