diff options
Diffstat (limited to 'drivers/net/fs_enet/fs_enet-main.c')
-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 445763e5648..52911889fd1 100644 --- a/drivers/net/fs_enet/fs_enet-main.c +++ b/drivers/net/fs_enet/fs_enet-main.c | |||
@@ -738,9 +738,6 @@ static void generic_adjust_link(struct net_device *dev) | |||
738 | if (!fep->oldlink) { | 738 | if (!fep->oldlink) { |
739 | new_state = 1; | 739 | new_state = 1; |
740 | fep->oldlink = 1; | 740 | fep->oldlink = 1; |
741 | netif_tx_schedule_all(dev); | ||
742 | netif_carrier_on(dev); | ||
743 | netif_start_queue(dev); | ||
744 | } | 741 | } |
745 | 742 | ||
746 | if (new_state) | 743 | if (new_state) |
@@ -750,8 +747,6 @@ static void generic_adjust_link(struct net_device *dev) | |||
750 | fep->oldlink = 0; | 747 | fep->oldlink = 0; |
751 | fep->oldspeed = 0; | 748 | fep->oldspeed = 0; |
752 | fep->oldduplex = -1; | 749 | fep->oldduplex = -1; |
753 | netif_carrier_off(dev); | ||
754 | netif_stop_queue(dev); | ||
755 | } | 750 | } |
756 | 751 | ||
757 | if (new_state && netif_msg_link(fep)) | 752 | if (new_state && netif_msg_link(fep)) |
@@ -826,6 +821,8 @@ static int fs_enet_open(struct net_device *dev) | |||
826 | } | 821 | } |
827 | phy_start(fep->phydev); | 822 | phy_start(fep->phydev); |
828 | 823 | ||
824 | netif_start_queue(dev); | ||
825 | |||
829 | return 0; | 826 | return 0; |
830 | } | 827 | } |
831 | 828 | ||