Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ee574e0 authored by Mark Einon's avatar Mark Einon Committed by Greg Kroah-Hartman
Browse files

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: default avatarMark Einon <mark.einon@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 3e3b5f39

drivers/staging/et131x/et1310_phy.c

+0 −3
Original line number Diff line number Diff line
@@ -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);