patch-2.1.36 linux/drivers/net/pi2.c

• Lines: 49
• Date: Tue Apr 22 22:42:49 1997
• Orig file: v2.1.35/linux/drivers/net/pi2.c
• Orig date: Fri Apr 4 08:52:21 1997

diff -u --recursive --new-file v2.1.35/linux/drivers/net/pi2.c linux/drivers/net/pi2.c
@@ -112,6 +112,7 @@
 #include <linux/timer.h>
 #include <linux/if_arp.h>
 #include <linux/pi2.h>
+#include <linux/init.h>
 #include "z8530.h"
 #include <net/ax25.h>
 
@@ -564,7 +565,6 @@
 		   pkt_len - 1);
 	    skb->protocol=htons(ETH_P_AX25);
 	    skb->mac.raw=skb->data;
-	    IS_SKB(skb);
 	    netif_rx(skb);
 	    lp->stats.rx_packets++;
 	}			/* end good frame */
@@ -652,7 +652,6 @@
 		memcpy(cfix, lp->rcvbuf->data, pkt_len - 1);
 		skb->protocol=ntohs(ETH_P_AX25);
 		skb->mac.raw=skb->data;
-		IS_SKB(skb);
 		netif_rx(skb);
 		lp->stats.rx_packets++;
 		/* packet queued - initialize buffer for next frame */
@@ -933,7 +932,7 @@
 /* Probe for a PI card. */
 /* This routine also initializes the timer chip */
 
-static int hw_probe(int ioaddr)
+__initfunc(static int hw_probe(int ioaddr))
 {
     int time = 1000;		/* Number of milliseconds for test */
     unsigned long start_time, end_time;
@@ -1188,13 +1187,12 @@
 }
 
 
-int pi_init(void)
+__initfunc(int pi_init(void))
 {
     int *port;
     int ioaddr = 0;
     int card_type = 0;
-    int ports[] =
-    {0x380, 0x300, 0x320, 0x340, 0x360, 0x3a0, 0};
+    int ports[] = {0x380, 0x300, 0x320, 0x340, 0x360, 0x3a0, 0};
 
     printk(KERN_INFO "PI: V0.8 ALPHA April 23 1995 David Perry (dp@hydra.carleton.ca)\n");