diff options
| author | Mark Einon <mark.einon@gmail.com> | 2011-08-23 23:40:38 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-23 16:25:28 -0700 |
| commit | c922d1241ff37ab2db0f1a29e4b043fe1d8a8e8c (patch) | |
| tree | 98b3145b7046e6398d3f614bfb63f632bee1119c /drivers/staging/et131x/et1310_phy.c | |
| parent | 10f00a49b048abf759b789a84c4c3431360aa38f (diff) | |
staging: et131x: Fix link detection signalling
Remove redundant code around netif_carrier_XXX calls, and associated adapter->media_state, which prevented the link from being reported as off.
Tested on an ET-1310 device.
Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/et131x/et1310_phy.c')
| -rw-r--r-- | drivers/staging/et131x/et1310_phy.c | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/drivers/staging/et131x/et1310_phy.c b/drivers/staging/et131x/et1310_phy.c index 6eb9d5cb6432..2c6898f707be 100644 --- a/drivers/staging/et131x/et1310_phy.c +++ b/drivers/staging/et131x/et1310_phy.c @@ -737,16 +737,6 @@ void et131x_mii_check(struct et131x_adapter *adapter, if (bmsr_ints & MI_BMSR_LINK_STATUS) { if (bmsr & MI_BMSR_LINK_STATUS) { adapter->boot_coma = 20; - - /* Update our state variables and indicate the - * connected state - */ - spin_lock_irqsave(&adapter->lock, flags); - - adapter->media_state = NETIF_STATUS_MEDIA_CONNECT; - - spin_unlock_irqrestore(&adapter->lock, flags); - netif_carrier_on(adapter->netdev); } else { dev_warn(&adapter->pdev->dev, @@ -768,21 +758,7 @@ void et131x_mii_check(struct et131x_adapter *adapter, et131x_mii_write(adapter, 0x12, register18); } - /* For the first N seconds of life, we are in "link - * detection" When we are in this state, we should - * only report "connected". When the LinkDetection - * Timer expires, we can report disconnected (handled - * in the LinkDetectionDPC). - */ - if (adapter->media_state == NETIF_STATUS_MEDIA_DISCONNECT) { - spin_lock_irqsave(&adapter->lock, flags); - adapter->media_state = - NETIF_STATUS_MEDIA_DISCONNECT; - spin_unlock_irqrestore(&adapter->lock, - flags); - - netif_carrier_off(adapter->netdev); - } + netif_carrier_off(adapter->netdev); adapter->linkspeed = 0; adapter->duplex_mode = 0; |