equal
deleted
inserted
replaced
1354 |
1354 |
1355 /* disallow open during test */ |
1355 /* disallow open during test */ |
1356 if (test_bit(__E1000_TESTING, &adapter->flags)) |
1356 if (test_bit(__E1000_TESTING, &adapter->flags)) |
1357 return -EBUSY; |
1357 return -EBUSY; |
1358 |
1358 |
1359 netif_carrier_off(netdev); |
1359 if (!adapter->ecdev) { |
|
1360 netif_carrier_off(netdev); |
|
1361 } |
1360 |
1362 |
1361 /* allocate transmit descriptors */ |
1363 /* allocate transmit descriptors */ |
1362 err = e1000_setup_all_tx_resources(adapter); |
1364 err = e1000_setup_all_tx_resources(adapter); |
1363 if (err) |
1365 if (err) |
1364 goto err_setup_tx; |
1366 goto err_setup_tx; |
1387 goto err_req_irq; |
1389 goto err_req_irq; |
1388 |
1390 |
1389 /* From here on the code is the same as e1000_up() */ |
1391 /* From here on the code is the same as e1000_up() */ |
1390 clear_bit(__E1000_DOWN, &adapter->flags); |
1392 clear_bit(__E1000_DOWN, &adapter->flags); |
1391 |
1393 |
1392 napi_enable(&adapter->napi); |
1394 if (!adapter->ecdev) { |
1393 |
1395 napi_enable(&adapter->napi); |
1394 e1000_irq_enable(adapter); |
1396 |
1395 |
1397 e1000_irq_enable(adapter); |
1396 netif_start_queue(netdev); |
1398 |
|
1399 netif_start_queue(netdev); |
|
1400 } |
1397 |
1401 |
1398 /* fire a link status change interrupt to start the watchdog */ |
1402 /* fire a link status change interrupt to start the watchdog */ |
1399 ew32(ICS, E1000_ICS_LSC); |
1403 ew32(ICS, E1000_ICS_LSC); |
1400 |
1404 |
1401 return E1000_SUCCESS; |
1405 return E1000_SUCCESS; |