leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: et131x: remove calls to netif_carrier_[on|off] from et131x_mii_check

Browse Source 
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>
This commit is contained in:
Mark Einon 2011-09-04 11:24:36 +01:00 committed by Greg Kroah-Hartman
parent 3e3b5f3915
commit 5ee574e0c4
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/staging/et131x/et1310_phy.c
View File

@ -452,7 +452,6 @@ void et131x_mii_check(struct et131x_adapter *adapter,
if (bmsr_ints & BMSR_LSTATUS) { if (bmsr_ints & BMSR_LSTATUS) {
if (bmsr & BMSR_LSTATUS) { if (bmsr & BMSR_LSTATUS) {
adapter->boot_coma = 20; adapter->boot_coma = 20;
netif_carrier_on(adapter->netdev);
} else { } else {
dev_warn(&adapter->pdev->dev, dev_warn(&adapter->pdev->dev,
"Link down - cable problem ?\n"); "Link down - cable problem ?\n");
@ -475,8 +474,6 @@ void et131x_mii_check(struct et131x_adapter *adapter,
et131x_mii_write(adapter, 0x12, register18); et131x_mii_write(adapter, 0x12, register18);
} }
netif_carrier_off(adapter->netdev);
/* Free the packets being actively sent & stopped */ /* Free the packets being actively sent & stopped */
et131x_free_busy_send_packets(adapter); et131x_free_busy_send_packets(adapter);