devices/e1000/e1000_main-3.0-ethercat.c
branchstable-1.5
changeset 2469 634ba3b1eb95
parent 2386 6742f8751872
child 2471 fc64a4b1ec1a
equal deleted inserted replaced
2468:3134b7255f3d 2469:634ba3b1eb95
  1421 		goto err_req_irq;
  1421 		goto err_req_irq;
  1422 
  1422 
  1423 	/* From here on the code is the same as e1000_up() */
  1423 	/* From here on the code is the same as e1000_up() */
  1424 	clear_bit(__E1000_DOWN, &adapter->flags);
  1424 	clear_bit(__E1000_DOWN, &adapter->flags);
  1425 
  1425 
  1426 	napi_enable(&adapter->napi);
  1426 	if (!adapter->ecdev) {
  1427 
  1427 		napi_enable(&adapter->napi);
  1428 	e1000_irq_enable(adapter);
  1428 
  1429 
  1429 		e1000_irq_enable(adapter);
  1430 	netif_start_queue(netdev);
  1430 
       
  1431 		netif_start_queue(netdev);
       
  1432 	}
  1431 
  1433 
  1432 	/* fire a link status change interrupt to start the watchdog */
  1434 	/* fire a link status change interrupt to start the watchdog */
  1433 	ew32(ICS, E1000_ICS_LSC);
  1435 	ew32(ICS, E1000_ICS_LSC);
  1434 
  1436 
  1435 	return E1000_SUCCESS;
  1437 	return E1000_SUCCESS;