projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[linux-2.6-block.git]
/
drivers
/
net
/
sgiseeq.c
diff --git
a/drivers/net/sgiseeq.c
b/drivers/net/sgiseeq.c
index beb537dbe9a9ad8cef497659e5f00e0b15fc1f0e..c8fc896fc4600dfc348d0229f0cf91b8755be037 100644
(file)
--- a/
drivers/net/sgiseeq.c
+++ b/
drivers/net/sgiseeq.c
@@
-593,8
+593,10
@@
static int sgiseeq_start_xmit(struct sk_buff *skb, struct net_device *dev)
/* Setup... */
len = skb->len;
if (len < ETH_ZLEN) {
- if (skb_padto(skb, ETH_ZLEN))
+ if (skb_padto(skb, ETH_ZLEN)) {
+ spin_unlock_irqrestore(&sp->tx_lock, flags);
return NETDEV_TX_OK;
+ }
len = ETH_ZLEN;
}