devices/e1000/e1000_main-2.6.35-ethercat.c
branchstable-1.5
changeset 2469 634ba3b1eb95
parent 2421 bc2d4bf9cbe5
child 2471 fc64a4b1ec1a
equal deleted inserted replaced
2468:3134b7255f3d 2469:634ba3b1eb95
  1336 		goto err_req_irq;
  1336 		goto err_req_irq;
  1337 
  1337 
  1338 	/* From here on the code is the same as e1000_up() */
  1338 	/* From here on the code is the same as e1000_up() */
  1339 	clear_bit(__E1000_DOWN, &adapter->flags);
  1339 	clear_bit(__E1000_DOWN, &adapter->flags);
  1340 
  1340 
  1341 	napi_enable(&adapter->napi);
  1341 	if (!adapter->ecdev) {
  1342 
  1342 		napi_enable(&adapter->napi);
  1343 	e1000_irq_enable(adapter);
  1343 
  1344 
  1344 		e1000_irq_enable(adapter);
  1345 	netif_start_queue(netdev);
  1345 
       
  1346 		netif_start_queue(netdev);
       
  1347 	}
  1346 
  1348 
  1347 	/* fire a link status change interrupt to start the watchdog */
  1349 	/* fire a link status change interrupt to start the watchdog */
  1348 	ew32(ICS, E1000_ICS_LSC);
  1350 	ew32(ICS, E1000_ICS_LSC);
  1349 
  1351 
  1350 	return E1000_SUCCESS;
  1352 	return E1000_SUCCESS;