equal
deleted
inserted
replaced
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); |