X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=drivers%2Fnet%2Flp486e.c;h=94d5ea1ce8bd9b9c9e14f05694e699c387eff662;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=393aba95cf12709e2621f0e070b11612fcf74c36;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/drivers/net/lp486e.c b/drivers/net/lp486e.c
index 393aba95c..94d5ea1ce 100644
--- a/drivers/net/lp486e.c
+++ b/drivers/net/lp486e.c
@@ -442,16 +442,16 @@ init_rx_bufs(struct net_device *dev, int num) {
 		if (rbd) {
 			rbd->pad = 0;
 			rbd->count = 0;
-			rbd->skb = dev_alloc_skb(RX_SKBSIZE);
+			rbd->skb = dev_alloc_skb(RX_SKB_SIZE);
 			if (!rbd->skb) {
 				printk("dev_alloc_skb failed");
 			}
 			rbd->next = rfd->rbd;
 			if (i) {
 				rfd->rbd->prev = rbd;
-				rbd->size = RX_SKBSIZE;
+				rbd->size = RX_SKB_SIZE;
 			} else {
-				rbd->size = (RX_SKBSIZE | RBD_EL);
+				rbd->size = (RX_SKB_SIZE | RBD_EL);
 				lp->rbd_tail = rbd;
 			}
 
@@ -851,7 +851,7 @@ static int i596_open(struct net_device *dev)
 {
 	int i;
 
-	i = request_irq(dev->irq, &i596_interrupt, IRQF_SHARED, dev->name, dev);
+	i = request_irq(dev->irq, &i596_interrupt, SA_SHIRQ, dev->name, dev);
 	if (i) {
 		printk(KERN_ERR "%s: IRQ %d not free\n", dev->name, dev->irq);
 		return i;
@@ -877,7 +877,8 @@ static int i596_start_xmit (struct sk_buff *skb, struct net_device *dev) {
 	length = skb->len;
 	
 	if (length < ETH_ZLEN) {
-		if (skb_padto(skb, ETH_ZLEN))
+		skb = skb_padto(skb, ETH_ZLEN);
+		if (skb == NULL)
 			return 0;
 		length = ETH_ZLEN;
 	}