projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
[powerpc.git]
/
drivers
/
net
/
pcmcia
/
xirc2ps_cs.c
diff --git
a/drivers/net/pcmcia/xirc2ps_cs.c
b/drivers/net/pcmcia/xirc2ps_cs.c
index
e80d1e3
..
9bae77c
100644
(file)
--- a/
drivers/net/pcmcia/xirc2ps_cs.c
+++ b/
drivers/net/pcmcia/xirc2ps_cs.c
@@
-1374,8
+1374,7
@@
do_start_xmit(struct sk_buff *skb, struct net_device *dev)
*/
if (pktlen < ETH_ZLEN)
{
- skb = skb_padto(skb, ETH_ZLEN);
- if (skb == NULL)
+ if (skb_padto(skb, ETH_ZLEN))
return 0;
pktlen = ETH_ZLEN;
}