devices/e1000/e1000_main-2.6.24-ethercat.c
branchstable-1.5
changeset 2469 634ba3b1eb95
parent 2421 bc2d4bf9cbe5
child 2471 fc64a4b1ec1a
equal deleted inserted replaced
2468:3134b7255f3d 2469:634ba3b1eb95
  1477 
  1477 
  1478 	/* From here on the code is the same as e1000_up() */
  1478 	/* From here on the code is the same as e1000_up() */
  1479 	clear_bit(__E1000_DOWN, &adapter->flags);
  1479 	clear_bit(__E1000_DOWN, &adapter->flags);
  1480 
  1480 
  1481 #ifdef CONFIG_E1000_NAPI
  1481 #ifdef CONFIG_E1000_NAPI
  1482 	napi_enable(&adapter->napi);
  1482 	if (!adapter->ecdev) {
       
  1483 		napi_enable(&adapter->napi);
       
  1484 	}
  1483 #endif
  1485 #endif
  1484 
  1486 
  1485 	e1000_irq_enable(adapter);
  1487 	e1000_irq_enable(adapter);
  1486 
  1488 
  1487 	/* fire a link status change interrupt to start the watchdog */
  1489 	/* fire a link status change interrupt to start the watchdog */