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 <[email protected]>
---
 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 0fccb86..6c3ceed 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);
 
-- 
1.7.6

_______________________________________________
devel mailing list
[email protected]
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel

Reply via email to