git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit 'origin/master' into next
[pandora-kernel.git]
/
drivers
/
net
/
sis900.c
diff --git
a/drivers/net/sis900.c
b/drivers/net/sis900.c
index
2d4617b
..
a9a897b
100644
(file)
--- a/
drivers/net/sis900.c
+++ b/
drivers/net/sis900.c
@@
-1584,7
+1584,7
@@
sis900_start_xmit(struct sk_buff *skb, struct net_device *net_dev)
/* Don't transmit data before the complete of auto-negotiation */
if(!sis_priv->autong_complete){
netif_stop_queue(net_dev);
- return
1
;
+ return
NETDEV_TX_BUSY
;
}
spin_lock_irqsave(&sis_priv->lock, flags);