diff options
| author |   Wei Yang <w90p710@gmail.com> | 2012-07-25 02:13:59 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-07-25 15:24:13 -0700 |
| commit | 6d8d2dd8ad92ec89f540e73b7a46c5835a7a06a6 (patch) | |
| tree | f28674234bae0bfb9c6da669a3f85fb9abe6cafb /drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | |
| parent | qeth: repair crash in qeth_l3_vlan_rx_kill_vid() (diff) | |
| download | linux-dev-6d8d2dd8ad92ec89f540e73b7a46c5835a7a06a6.tar.xz linux-dev-6d8d2dd8ad92ec89f540e73b7a46c5835a7a06a6.zip | |
net/pch_gpe: Cannot disable ethernet autonegation
When attempting to disable ethernet autonegation via ethtool,
the pch_gpe driver will set software reset bit of PHY chip, But
control register of PHY chip of FRI2 will reenable ethernet autonegation.
Signed-off-by: Wei Yang <w90p710@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c index b1006563f736..8e0e5f0fb4fd 100644 --- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c +++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c @@ -1988,6 +1988,7 @@ int pch_gbe_up(struct pch_gbe_adapter *adapter) void pch_gbe_down(struct pch_gbe_adapter *adapter) { struct net_device *netdev = adapter->netdev; + struct pci_dev *pdev = adapter->pdev; struct pch_gbe_rx_ring *rx_ring = adapter->rx_ring; /* signal that we're down so the interrupt handler does not @@ -2004,7 +2005,8 @@ void pch_gbe_down(struct pch_gbe_adapter *adapter) netif_carrier_off(netdev); netif_stop_queue(netdev); - pch_gbe_reset(adapter); + if ((pdev->error_state) && (pdev->error_state != pci_channel_io_normal)) + pch_gbe_reset(adapter); pch_gbe_clean_tx_ring(adapter, adapter->tx_ring); pch_gbe_clean_rx_ring(adapter, adapter->rx_ring); |