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
/
atarilance.c
diff --git
a/drivers/net/atarilance.c
b/drivers/net/atarilance.c
index
442b2cb
..
91783a8
100644
(file)
--- a/
drivers/net/atarilance.c
+++ b/
drivers/net/atarilance.c
@@
-804,8
+804,7
@@
static int lance_start_xmit( struct sk_buff *skb, struct net_device *dev )
++len;
if (len > skb->len) {
++len;
if (len > skb->len) {
- skb = skb_padto(skb, len);
- if (skb == NULL)
+ if (skb_padto(skb, len))
return 0;
}
return 0;
}