OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c0cd1ba
)
net/faraday: Stop NCSI device on shutdown
author
Gavin Shan
<gwshan@linux.vnet.ibm.com>
Tue, 4 Oct 2016 00:25:54 +0000
(11:25 +1100)
committer
David S. Miller
<davem@davemloft.net>
Tue, 4 Oct 2016 06:11:51 +0000
(
02:11
-0400)
This stops NCSI device when closing the network device so that the
NCSI device can be reenabled later.
Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/faraday/ftgmac100.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/faraday/ftgmac100.c
b/drivers/net/ethernet/faraday/ftgmac100.c
index
90f9c54
..
2625872
100644
(file)
--- a/
drivers/net/ethernet/faraday/ftgmac100.c
+++ b/
drivers/net/ethernet/faraday/ftgmac100.c
@@
-1190,6
+1190,8
@@
static int ftgmac100_stop(struct net_device *netdev)
napi_disable(&priv->napi);
if (netdev->phydev)
phy_stop(netdev->phydev);
+ else if (priv->use_ncsi)
+ ncsi_stop_dev(priv->ndev);
ftgmac100_stop_hw(priv);
free_irq(priv->irq, netdev);