Merge with 2.3.19.

4 files changed, 37 insertions, 33 deletions

diff --git a/drivers/ap1000/.cvsignore b/drivers/ap1000/.cvsignore
new file mode 100644
index 000000000..6d007a06f
--- /dev/null
+++ b/drivers/ap1000/.cvsignore
@@ -0,0 +1,4 @@
+.depend
+.*.flags
+aic7xxx_asm
+aic7xxx_seq.h
diff --git a/drivers/ap1000/apfddi.c b/drivers/ap1000/apfddi.c
index dcc540411..b215e8d03 100644
--- a/drivers/ap1000/apfddi.c
+++ b/drivers/ap1000/apfddi.c
@@ -124,7 +124,7 @@ u_char fddi_bitrev[256] = {
 /* XXX our hardware address, canonical bit order */
 static u_char apfddi_saddr[6] = { 0x42, 0x9a, 0x08, 0x6e, 0x11, 0x41 };
 
-struct device *apfddi_device = NULL;
+struct net_device *apfddi_device = NULL;
 struct net_device_stats *apfddi_stats = NULL;
 
 volatile struct apfddi_queue *apfddi_queue_top = NULL;
@@ -249,11 +249,11 @@ void rmt_event(int st)
 }
 
 
-int apfddi_init(struct device *dev);
+int apfddi_init(struct net_device *dev);
 static void apfddi_interrupt(int irq, void *dev_id, struct pt_regs *regs);
-static int apfddi_xmit(struct sk_buff *skb, struct device *dev);
+static int apfddi_xmit(struct sk_buff *skb, struct net_device *dev);
 int apfddi_rx(struct mac_buf *mbuf);
-static struct net_device_stats *apfddi_get_stats(struct device *dev);
+static struct net_device_stats *apfddi_get_stats(struct net_device *dev);
 #if APFDDI_DEBUG
 void dump_packet(char *action, char *buf, int len, int seq);
 #endif
@@ -264,7 +264,7 @@ void dump_packet(char *action, char *buf, int len, int seq);
  * saddr=NULL means use device source address (always will anyway)
  * daddr=NULL means leave destination address (eg unresolved arp)
  */
-static int apfddi_hard_header(struct sk_buff *skb, struct device *dev,
+static int apfddi_hard_header(struct sk_buff *skb, struct net_device *dev,
 			      unsigned short type, void *daddr,
 			      void *saddr, unsigned len)
 {
@@ -366,7 +366,7 @@ static int apfddi_hard_header(struct sk_buff *skb, struct device *dev,
  * other address resolution) has completed on this sk_buff. We now let
  * ARP fill in the other fields.  
  */
-static int apfddi_rebuild_header(void *buff, struct device *dev,
+static int apfddi_rebuild_header(void *buff, struct net_device *dev,
 				 unsigned long raddr, struct sk_buff *skb)
 {
     int i, status;
@@ -399,7 +399,7 @@ static int apfddi_rebuild_header(void *buff, struct device *dev,
     return(status);
 }
 
-static int apfddi_set_mac_address(struct device *dev, void *addr)
+static int apfddi_set_mac_address(struct net_device *dev, void *addr)
 {
 #if APFDDI_DEBUG
     printk("In apfddi_set_mac_address\n");
@@ -407,14 +407,14 @@ static int apfddi_set_mac_address(struct device *dev, void *addr)
     return (0);
 }
 
-static void apfddi_set_multicast_list(struct device *dev)
+static void apfddi_set_multicast_list(struct net_device *dev)
 {
 #if APFDDI_DEBUG
     printk("In apfddi_set_multicast_list\n");
 #endif
 }
 
-static int apfddi_do_ioctl(struct device *dev, struct ifreq *ifr, int cmd)
+static int apfddi_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
 #if APFDDI_DEBUG
     printk("In apfddi_do_ioctl\n");
@@ -422,7 +422,7 @@ static int apfddi_do_ioctl(struct device *dev, struct ifreq *ifr, int cmd)
     return (0);
 }
 
-static int apfddi_set_config(struct device *dev, struct ifmap *map)
+static int apfddi_set_config(struct net_device *dev, struct ifmap *map)
 {
 #if APFDDI_DEBUG
     printk("In apfddi_set_config\n");
@@ -433,7 +433,7 @@ static int apfddi_set_config(struct device *dev, struct ifmap *map)
 /*
  * Opening the fddi device through ifconfig.
  */
-int apfddi_open(struct device *dev)
+int apfddi_open(struct net_device *dev)
 {
     static int already_run = 0;
     unsigned flags;
@@ -473,7 +473,7 @@ int apfddi_open(struct device *dev)
 /*
  * Stop the fddi device through ifconfig.
  */
-int apfddi_stop(struct device *dev)
+int apfddi_stop(struct net_device *dev)
 {
     *csr0 &= ~CS0_INT_ENABLE;
     apfddi_sleep();
@@ -484,7 +484,7 @@ int apfddi_stop(struct device *dev)
 /*
  * Initialise fddi network interface.
  */
-int apfddi_init(struct device *dev)
+int apfddi_init(struct net_device *dev)
 {
     int i;
 
@@ -625,7 +625,7 @@ static void apfddi_print_frame(struct sk_buff *skb)
 /*
  * Transmitting packet over FDDI.
  */
-static int apfddi_xmit(struct sk_buff *skb, struct device *dev)
+static int apfddi_xmit(struct sk_buff *skb, struct net_device *dev)
 {
     unsigned long flags;
     
@@ -692,7 +692,7 @@ void print_mbuf(struct mac_buf *mbuf)
 /*
  * Return statistics of fddi driver.
  */
-static struct net_device_stats *apfddi_get_stats(struct device *dev)
+static struct net_device_stats *apfddi_get_stats(struct net_device *dev)
 {
     return((struct net_device_stats *)dev->priv);
 }
diff --git a/drivers/ap1000/apfddi.h b/drivers/ap1000/apfddi.h
index 33230186e..a77dd6160 100644
--- a/drivers/ap1000/apfddi.h
+++ b/drivers/ap1000/apfddi.h
@@ -137,6 +137,6 @@ void set_ring_op(int up);
 void rmt_event(int st);
 void set_cf_join(int on);
 
-extern struct device *apfddi_device;
+extern struct net_device *apfddi_device;
 extern struct net_device_stats *apfddi_stats;
 
diff --git a/drivers/ap1000/bif.c b/drivers/ap1000/bif.c
index 08492ca17..331ee0f26 100644
--- a/drivers/ap1000/bif.c
+++ b/drivers/ap1000/bif.c
@@ -44,17 +44,17 @@ static int seq = 0;
 
 #define BIF_MTU 10240
 
-static struct device *bif_device = 0;
+static struct net_device *bif_device = 0;
 static struct net_device_stats *bif_stats = 0;
 
-int bif_init(struct device *dev);
-int bif_open(struct device *dev);
-static int bif_xmit(struct sk_buff *skb, struct device *dev);
+int bif_init(struct net_device *dev);
+int bif_open(struct net_device *dev);
+static int bif_xmit(struct sk_buff *skb, struct net_device *dev);
 int bif_rx(struct sk_buff *skb);
-int bif_stop(struct device *dev);
-static struct net_device_stats *bif_get_stats(struct device *dev);
+int bif_stop(struct net_device *dev);
+static struct net_device_stats *bif_get_stats(struct net_device *dev);
 
-static int bif_hard_header(struct sk_buff *skb, struct device *dev,
+static int bif_hard_header(struct sk_buff *skb, struct net_device *dev,
 			   unsigned short type, void *daddr,
 			   void *saddr, unsigned len)
 {
@@ -70,7 +70,7 @@ static int bif_hard_header(struct sk_buff *skb, struct device *dev,
   return (dev->hard_header_len);
 }
 
-static int bif_rebuild_header(void *buff, struct device *dev,
+static int bif_rebuild_header(void *buff, struct net_device *dev,
 			      unsigned long raddr, struct sk_buff *skb)
 {
   /* this would normally be used to fill in hardware addresses after
@@ -82,24 +82,24 @@ static int bif_rebuild_header(void *buff, struct device *dev,
   return(0);
 }
 
-static int bif_set_mac_address(struct device *dev, void *addr)
+static int bif_set_mac_address(struct net_device *dev, void *addr)
 {
   printk("BIF: set_mac_address called\n");
   return (0);
 }
 
-static void bif_set_multicast_list(struct device *dev)
+static void bif_set_multicast_list(struct net_device *dev)
 {
   return;
 }
 
-static int bif_do_ioctl(struct device *dev, struct ifreq *ifr, int cmd)
+static int bif_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
   printk("BIF: Called do_ioctl\n");
   return (0);
 }
 
-static int bif_set_config(struct device *dev, struct ifmap *map)
+static int bif_set_config(struct net_device *dev, struct ifmap *map)
 {
   printk("BIF: Called bif_set_config\n");
   return (0);
@@ -108,7 +108,7 @@ static int bif_set_config(struct device *dev, struct ifmap *map)
 /*
  * Initialise bif network interface.
  */
-int bif_init(struct device *dev)
+int bif_init(struct net_device *dev)
 {
     int i;
 
@@ -149,7 +149,7 @@ int bif_init(struct device *dev)
     return(0);
 }
 
-int bif_open(struct device *dev)
+int bif_open(struct net_device *dev)
 {
     printk("In bif_open\n");
     dev->tbusy = 0;
@@ -189,7 +189,7 @@ static void dump_packet(char *action, char *buf, int len, int seq)
 #endif
 
 
-static int bif_xmit(struct sk_buff *skb, struct device *dev)
+static int bif_xmit(struct sk_buff *skb, struct net_device *dev)
 {
 	extern int bif_send_ip(int cid,struct sk_buff *skb);
 	extern int tnet_send_ip(int cid,struct sk_buff *skb);
@@ -260,7 +260,7 @@ int bif_rx(struct sk_buff *skb)
 	return 0;
 }
 
-int bif_stop(struct device *dev)
+int bif_stop(struct net_device *dev)
 {
 	printk("in bif_close\n");
 
@@ -273,7 +273,7 @@ int bif_stop(struct device *dev)
 /*
  * Return statistics of bif driver.
  */
-static struct net_device_stats *bif_get_stats(struct device *dev)
+static struct net_device_stats *bif_get_stats(struct net_device *dev)
 {
     return((struct net_device_stats *)dev->priv);
 }