diff options
| author | Mark Einon <mark.einon@gmail.com> | 2011-09-04 11:24:36 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-09-06 16:54:55 -0700 |
| commit | 5ee574e0c4ff86f3759987f833f06d4f0cdeb953 (patch) | |
| tree | 7e2c25c28fb4a3f45ebe463cf1495a9922f63268 /drivers/staging/et131x/et1310_phy.c | |
| parent | 3e3b5f39159b97baa1dd38bff848aeccd996b7f0 (diff) | |
staging: et131x: remove calls to netif_carrier_[on|off] from et131x_mii_check
As et131x_adjust_link is called from the phydev in response to a netif_carrier_[on|off], and is the only caller of et131x_mii_check, we don't need to call netif_carrier_[on|off] again.
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 | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/staging/et131x/et1310_phy.c b/drivers/staging/et131x/et1310_phy.c index 0fccb86810c0..6c3ceed8aa52 100644 --- a/drivers/staging/et131x/et1310_phy.c +++ b/drivers/staging/et131x/et1310_phy.c @@ -452,7 +452,6 @@ void et131x_mii_check(struct et131x_adapter *adapter, if (bmsr_ints & BMSR_LSTATUS) { if (bmsr & BMSR_LSTATUS) { adapter->boot_coma = 20; - netif_carrier_on(adapter->netdev); } else { dev_warn(&adapter->pdev->dev, "Link down - cable problem ?\n"); @@ -475,8 +474,6 @@ void et131x_mii_check(struct et131x_adapter *adapter, et131x_mii_write(adapter, 0x12, register18); } - netif_carrier_off(adapter->netdev); - /* Free the packets being actively sent & stopped */ et131x_free_busy_send_packets(adapter); |