patch-2.1.67 linux/drivers/net/myri_sbus.c

Next file: linux/drivers/net/ni5010.c
Previous file: linux/drivers/net/mkiss.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.66/linux/drivers/net/myri_sbus.c linux/drivers/net/myri_sbus.c
@@ -594,12 +594,6 @@
 		}
 	}
 
-	if(skb == NULL || skb->len <= 0) {
-		DTX(("skb is null, aieee... returning 0\n"));
-		dev_tint(dev);
-		return 0;
-	}
-
 	if(test_and_set_bit(0, (void *) &dev->tbusy) != 0) {
 		DTX(("tbusy, maybe a race? returning 1\n"));
 		printk("%s: Transmitter access conflict.\n", dev->name);
@@ -1089,7 +1083,7 @@
 	dev->hard_start_xmit = &myri_start_xmit;
 	dev->get_stats = &myri_get_stats;
 	dev->set_multicast_list = &myri_set_multicast;
-	dev->irq = (unsigned char) sdev->irqs[0].pri;
+	dev->irq = sdev->irqs[0].pri;
 	dev->dma = 0;
 
 	/* Register interrupt handler now. */

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov