From 3059b994b6686b4fd0430a90198b8e48ad4b205c Mon Sep 17 00:00:00 2001 From: Mark Einon Date: Sun, 4 Sep 2011 11:24:36 +0100 Subject: [PATCH] --- yaml --- r: 268270 b: refs/heads/master c: 5ee574e0c4ff86f3759987f833f06d4f0cdeb953 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/et131x/et1310_phy.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ec1f6128e6b6..2a3ebbf597f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3e3b5f39159b97baa1dd38bff848aeccd996b7f0 +refs/heads/master: 5ee574e0c4ff86f3759987f833f06d4f0cdeb953 diff --git a/trunk/drivers/staging/et131x/et1310_phy.c b/trunk/drivers/staging/et131x/et1310_phy.c index 0fccb86810c0..6c3ceed8aa52 100644 --- a/trunk/drivers/staging/et131x/et1310_phy.c +++ b/trunk/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);