projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[linux-2.6-microblaze.git]
/
drivers
/
net
/
ibm_newemac
/
core.c
diff --git
a/drivers/net/ibm_newemac/core.c
b/drivers/net/ibm_newemac/core.c
index
806533c
..
f0f8908
100644
(file)
--- a/
drivers/net/ibm_newemac/core.c
+++ b/
drivers/net/ibm_newemac/core.c
@@
-1305,6
+1305,8
@@
static int emac_close(struct net_device *ndev)
free_irq(dev->emac_irq, dev);
+ netif_carrier_off(ndev);
+
return 0;
}
@@
-1484,7
+1486,7
@@
static int emac_start_xmit_sg(struct sk_buff *skb, struct net_device *ndev)
stop_queue:
netif_stop_queue(ndev);
DBG2(dev, "stopped TX queue" NL);
- return
1
;
+ return
NETDEV_TX_BUSY
;
}
/* Tx lock BHs */