diff options
Diffstat (limited to 'drivers/net/fs_enet')
-rw-r--r-- | drivers/net/fs_enet/fs_enet-main.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c index 92591384afa5..9a51ec8293cc 100644 --- a/drivers/net/fs_enet/fs_enet-main.c +++ b/drivers/net/fs_enet/fs_enet-main.c | |||
@@ -730,9 +730,6 @@ static void generic_adjust_link(struct net_device *dev) | |||
730 | if (!fep->oldlink) { | 730 | if (!fep->oldlink) { |
731 | new_state = 1; | 731 | new_state = 1; |
732 | fep->oldlink = 1; | 732 | fep->oldlink = 1; |
733 | netif_tx_schedule_all(dev); | ||
734 | netif_carrier_on(dev); | ||
735 | netif_start_queue(dev); | ||
736 | } | 733 | } |
737 | 734 | ||
738 | if (new_state) | 735 | if (new_state) |
@@ -742,8 +739,6 @@ static void generic_adjust_link(struct net_device *dev) | |||
742 | fep->oldlink = 0; | 739 | fep->oldlink = 0; |
743 | fep->oldspeed = 0; | 740 | fep->oldspeed = 0; |
744 | fep->oldduplex = -1; | 741 | fep->oldduplex = -1; |
745 | netif_carrier_off(dev); | ||
746 | netif_stop_queue(dev); | ||
747 | } | 742 | } |
748 | 743 | ||
749 | if (new_state && netif_msg_link(fep)) | 744 | if (new_state && netif_msg_link(fep)) |
@@ -818,6 +813,8 @@ static int fs_enet_open(struct net_device *dev) | |||
818 | } | 813 | } |
819 | phy_start(fep->phydev); | 814 | phy_start(fep->phydev); |
820 | 815 | ||
816 | netif_start_queue(dev); | ||
817 | |||
821 | return 0; | 818 | return 0; |
822 | } | 819 | } |
823 | 820 | ||