devices/r8169-2.6.33-ethercat.c
branchstable-1.5
changeset 2225 a2a2f1a0d07b
parent 2201 7aeb32a5bb6d
child 2421 bc2d4bf9cbe5
child 2589 2b9c78543663
equal deleted inserted replaced
2224:4f6670f083f1 2225:a2a2f1a0d07b
  3231 	 */
  3231 	 */
  3232 	if (tp->mac_version == RTL_GIGA_MAC_VER_05)
  3232 	if (tp->mac_version == RTL_GIGA_MAC_VER_05)
  3233 		RTL_W16(CPlusCmd, RTL_R16(CPlusCmd) | RxVlan);
  3233 		RTL_W16(CPlusCmd, RTL_R16(CPlusCmd) | RxVlan);
  3234 
  3234 
  3235 	device_set_wakeup_enable(&pdev->dev, tp->features & RTL_FEATURE_WOL);
  3235 	device_set_wakeup_enable(&pdev->dev, tp->features & RTL_FEATURE_WOL);
       
  3236 
  3236 	if (tp->ecdev && ecdev_open(tp->ecdev)) {
  3237 	if (tp->ecdev && ecdev_open(tp->ecdev)) {
  3237 		ecdev_withdraw(tp->ecdev);
  3238 		ecdev_withdraw(tp->ecdev);
  3238 		goto err_out_msi_5;
  3239 		goto err_out_msi_5;
  3239 	}
  3240 	}
  3240 
  3241 
  4781 
  4782 
  4782 	if (!tp->ecdev) {
  4783 	if (!tp->ecdev) {
  4783 		netif_stop_queue(dev);
  4784 		netif_stop_queue(dev);
  4784 
  4785 
  4785 		napi_disable(&tp->napi);
  4786 		napi_disable(&tp->napi);
  4786  
       
  4787 	}
  4787 	}
  4788 
  4788 
  4789 core_down:
  4789 core_down:
  4790 	if (!tp->ecdev)
  4790 	if (!tp->ecdev)
  4791 		spin_lock_irq(&tp->lock);
  4791 		spin_lock_irq(&tp->lock);