git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
sis900.c
diff --git
a/drivers/net/sis900.c
b/drivers/net/sis900.c
index 2d4617b3e2087c9a7bcc9bf33a83f3e00bbf77cb..a9a897bb42d57f0342a7ee0405c06d005b51046d 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);