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
/
sis190.c
diff --git
a/drivers/net/sis190.c
b/drivers/net/sis190.c
index
31dd3f0
..
df0cbeb
100644
(file)
--- a/
drivers/net/sis190.c
+++ b/
drivers/net/sis190.c
@@
-1054,7
+1054,7
@@
static int sis190_open(struct net_device *dev)
sis190_request_timer(dev);
sis190_request_timer(dev);
- rc = request_irq(dev->irq, sis190_interrupt,
SA_SHIRQ
, dev->name, dev);
+ rc = request_irq(dev->irq, sis190_interrupt,
IRQF_SHARED
, dev->name, dev);
if (rc < 0)
goto err_release_timer_2;
if (rc < 0)
goto err_release_timer_2;
@@
-1156,8
+1156,7
@@
static int sis190_start_xmit(struct sk_buff *skb, struct net_device *dev)
dma_addr_t mapping;
if (unlikely(skb->len < ETH_ZLEN)) {
dma_addr_t mapping;
if (unlikely(skb->len < ETH_ZLEN)) {
- skb = skb_padto(skb, ETH_ZLEN);
- if (!skb) {
+ if (skb_padto(skb, ETH_ZLEN)) {
tp->stats.tx_dropped++;
goto out;
}
tp->stats.tx_dropped++;
goto out;
}