diff options
Diffstat (limited to 'drivers/net/e1000e/netdev.c')
| -rw-r--r-- | drivers/net/e1000e/netdev.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index c5f65a29865a..ab79bec082f0 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c | |||
| @@ -3444,6 +3444,15 @@ static int e1000_open(struct net_device *netdev) | |||
| 3444 | if (err) | 3444 | if (err) |
| 3445 | goto err_setup_rx; | 3445 | goto err_setup_rx; |
| 3446 | 3446 | ||
| 3447 | /* | ||
| 3448 | * If AMT is enabled, let the firmware know that the network | ||
| 3449 | * interface is now open and reset the part to a known state. | ||
| 3450 | */ | ||
| 3451 | if (adapter->flags & FLAG_HAS_AMT) { | ||
| 3452 | e1000_get_hw_control(adapter); | ||
| 3453 | e1000e_reset(adapter); | ||
| 3454 | } | ||
| 3455 | |||
| 3447 | e1000e_power_up_phy(adapter); | 3456 | e1000e_power_up_phy(adapter); |
| 3448 | 3457 | ||
| 3449 | adapter->mng_vlan_id = E1000_MNG_VLAN_NONE; | 3458 | adapter->mng_vlan_id = E1000_MNG_VLAN_NONE; |
| @@ -3452,13 +3461,6 @@ static int e1000_open(struct net_device *netdev) | |||
| 3452 | e1000_update_mng_vlan(adapter); | 3461 | e1000_update_mng_vlan(adapter); |
| 3453 | 3462 | ||
| 3454 | /* | 3463 | /* |
| 3455 | * If AMT is enabled, let the firmware know that the network | ||
| 3456 | * interface is now open | ||
| 3457 | */ | ||
| 3458 | if (adapter->flags & FLAG_HAS_AMT) | ||
| 3459 | e1000_get_hw_control(adapter); | ||
| 3460 | |||
| 3461 | /* | ||
| 3462 | * before we allocate an interrupt, we must be ready to handle it. | 3464 | * before we allocate an interrupt, we must be ready to handle it. |
| 3463 | * Setting DEBUG_SHIRQ in the kernel makes it fire an interrupt | 3465 | * Setting DEBUG_SHIRQ in the kernel makes it fire an interrupt |
| 3464 | * as soon as we call pci_request_irq, so we have to setup our | 3466 | * as soon as we call pci_request_irq, so we have to setup our |
