devices/e1000/e1000_main-2.6.27-ethercat.c
branchstable-1.5
changeset 2469 634ba3b1eb95
parent 2421 bc2d4bf9cbe5
child 2471 fc64a4b1ec1a
equal deleted inserted replaced
2468:3134b7255f3d 2469:634ba3b1eb95
  1529 		goto err_req_irq;
  1529 		goto err_req_irq;
  1530 
  1530 
  1531 	/* From here on the code is the same as e1000_up() */
  1531 	/* From here on the code is the same as e1000_up() */
  1532 	clear_bit(__E1000_DOWN, &adapter->flags);
  1532 	clear_bit(__E1000_DOWN, &adapter->flags);
  1533 
  1533 
  1534 	napi_enable(&adapter->napi);
  1534 	if (!adapter->ecdev) {
  1535 
  1535 		napi_enable(&adapter->napi);
  1536 	e1000_irq_enable(adapter);
  1536 
  1537 
  1537 		e1000_irq_enable(adapter);
  1538 	netif_start_queue(netdev);
  1538 
       
  1539 		netif_start_queue(netdev);
       
  1540 	}
  1539 
  1541 
  1540 	/* fire a link status change interrupt to start the watchdog */
  1542 	/* fire a link status change interrupt to start the watchdog */
  1541 	ew32(ICS, E1000_ICS_LSC);
  1543 	ew32(ICS, E1000_ICS_LSC);
  1542 
  1544 
  1543 	return E1000_SUCCESS;
  1545 	return E1000_SUCCESS;