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
/
arm
/
ether1.c
diff --git
a/drivers/net/arm/ether1.c
b/drivers/net/arm/ether1.c
index
36475eb
..
312955d
100644
(file)
--- a/
drivers/net/arm/ether1.c
+++ b/
drivers/net/arm/ether1.c
@@
-700,8
+700,7
@@
ether1_sendpacket (struct sk_buff *skb, struct net_device *dev)
}
if (skb->len < ETH_ZLEN) {
- skb = skb_padto(skb, ETH_ZLEN);
- if (skb == NULL)
+ if (skb_padto(skb, ETH_ZLEN))
goto out;
}