From 5ee574e0c4ff86f3759987f833f06d4f0cdeb953 Mon Sep 17 00:00:00 2001
From: Mark Einon <mark.einon@gmail.com>
Date: Sun, 4 Sep 2011 11:24:36 +0100
Subject: [PATCH] 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>
---
drivers/staging/et131x/et1310_phy.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/staging/et131x/et1310_phy.c b/drivers/staging/et131x/et1310_phy.c
index 0fccb86810c0c..6c3ceed8aa521 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);
--
2.30.2