移去rt

hc

2023-12-08 01573e231f18eb2d99162747186f59511f56b64d

 kernel/drivers/net/appletalk/cops.c
..
..
@@ -70,6 +70,8 @@
70
70
 #include <linux/bitops.h>
71
71
 #include <linux/jiffies.h>
72
72
 
73
+#include <net/Space.h>
74
+
73
75
 #include <asm/io.h>
74
76
 #include <asm/dma.h>
75
77
 
..
..
@@ -189,7 +191,7 @@
189
191
 
190
192
 static irqreturn_t cops_interrupt (int irq, void *dev_id);
191
193
 static void cops_poll(struct timer_list *t);
192
-static void cops_timeout(struct net_device *dev);
194
+static void cops_timeout(struct net_device *dev, unsigned int txqueue);
193
195
 static void cops_rx (struct net_device *dev);
194
196
 static netdev_tx_t  cops_send_packet (struct sk_buff *skb,
195
197
 					    struct net_device *dev);
..
..
@@ -301,7 +303,7 @@
301
303
 			dev->irq = cops_irq(ioaddr, board);
302
304
 			if (dev->irq)
303
305
 				break;
304
-			/* No IRQ found on this port, fallthrough */
306
+			fallthrough;	/* Once no IRQ found on this port */
305
307
 		case 1:
306
308
 			retval = -EINVAL;
307
309
 			goto err_out;
..
..
@@ -777,10 +779,7 @@
777
779
         }
778
780
 
779
781
         /* Get response length. */
780
-	if(lp->board==DAYNA)
781
-        	pkt_len = inb(ioaddr) & 0xFF;
782
-	else
783
-		pkt_len = inb(ioaddr) & 0x00FF;
782
+	pkt_len = inb(ioaddr);
784
783
         pkt_len |= (inb(ioaddr) << 8);
785
784
         /* Input IO code. */
786
785
         rsp_type=inb(ioaddr);
..
..
@@ -847,7 +846,7 @@
847
846
         netif_rx(skb);
848
847
 }
849
848
 
850
-static void cops_timeout(struct net_device *dev)
849
+static void cops_timeout(struct net_device *dev, unsigned int txqueue)
851
850
 {
852
851
         struct cops_local *lp = netdev_priv(dev);
853
852
         int ioaddr = dev->base_addr;
..
..
@@ -892,10 +891,7 @@
892
891
 
893
892
 	/* Output IO length. */
894
893
 	outb(skb->len, ioaddr);
895
-	if(lp->board == DAYNA)
896
-               	outb(skb->len >> 8, ioaddr);
897
-	else
898
-		outb((skb->len >> 8)&0x0FF, ioaddr);
894
+	outb(skb->len >> 8, ioaddr);
899
895
 
900
896
 	/* Output IO code. */
901
897
 	outb(LAP_WRITE, ioaddr);