Skip to content

Commit

Permalink
staging: et131x: remove calls to netif_carrier_[on|off] from et131x_m…
Browse files Browse the repository at this point in the history
…ii_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>
  • Loading branch information
Mark Einon authored and Greg Kroah-Hartman committed Sep 6, 2011
1 parent 3e3b5f3 commit 5ee574e
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions drivers/staging/et131x/et1310_phy.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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);

Expand Down

0 comments on commit 5ee574e

Please sign in to comment.