devices/e1000/e1000_main-2.6.26-ethercat.c
branchstable-1.5
changeset 2469 634ba3b1eb95
parent 2421 bc2d4bf9cbe5
child 2471 fc64a4b1ec1a
equal deleted inserted replaced
2468:3134b7255f3d 2469:634ba3b1eb95
  1542 
  1542 
  1543 	/* From here on the code is the same as e1000_up() */
  1543 	/* From here on the code is the same as e1000_up() */
  1544 	clear_bit(__E1000_DOWN, &adapter->flags);
  1544 	clear_bit(__E1000_DOWN, &adapter->flags);
  1545 
  1545 
  1546 #ifdef CONFIG_E1000_NAPI
  1546 #ifdef CONFIG_E1000_NAPI
  1547 	napi_enable(&adapter->napi);
  1547 	if (!adapter->ecdev) {
       
  1548 		napi_enable(&adapter->napi);
       
  1549 	}
  1548 #endif
  1550 #endif
  1549 
  1551 
  1550 	e1000_irq_enable(adapter);
  1552 	e1000_irq_enable(adapter);
  1551 
  1553 
  1552 	/* fire a link status change interrupt to start the watchdog */
  1554 	/* fire a link status change interrupt to start the watchdog */