git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
net
/
ariadne.c
diff --git
a/drivers/net/ariadne.c
b/drivers/net/ariadne.c
index
d1b6b1f
..
cc721ad
100644
(file)
--- a/
drivers/net/ariadne.c
+++ b/
drivers/net/ariadne.c
@@
-320,7
+320,7
@@
static int ariadne_open(struct net_device *dev)
netif_start_queue(dev);
netif_start_queue(dev);
- i = request_irq(IRQ_AMIGA_PORTS, ariadne_interrupt,
SA_SHIRQ
,
+ i = request_irq(IRQ_AMIGA_PORTS, ariadne_interrupt,
IRQF_SHARED
,
dev->name, dev);
if (i) return i;
dev->name, dev);
if (i) return i;
@@
-607,8
+607,7
@@
static int ariadne_start_xmit(struct sk_buff *skb, struct net_device *dev)
/* FIXME: is the 79C960 new enough to do its own padding right ? */
if (skb->len < ETH_ZLEN)
{
/* FIXME: is the 79C960 new enough to do its own padding right ? */
if (skb->len < ETH_ZLEN)
{
- skb = skb_padto(skb, ETH_ZLEN);
- if (skb == NULL)
+ if (skb_padto(skb, ETH_ZLEN))
return 0;
len = ETH_ZLEN;
}
return 0;
len = ETH_ZLEN;
}