| .. | .. |
|---|
| 224 | 224 | MODULE_DESCRIPTION("Broadcom Tigon3 ethernet driver"); |
|---|
| 225 | 225 | MODULE_LICENSE("GPL"); |
|---|
| 226 | 226 | MODULE_FIRMWARE(FIRMWARE_TG3); |
|---|
| 227 | +MODULE_FIRMWARE(FIRMWARE_TG357766); |
|---|
| 227 | 228 | MODULE_FIRMWARE(FIRMWARE_TG3TSO); |
|---|
| 228 | 229 | MODULE_FIRMWARE(FIRMWARE_TG3TSO5); |
|---|
| 229 | 230 | |
|---|
| .. | .. |
|---|
| 11185 | 11186 | rtnl_lock(); |
|---|
| 11186 | 11187 | tg3_full_lock(tp, 0); |
|---|
| 11187 | 11188 | |
|---|
| 11188 | | - if (!netif_running(tp->dev)) { |
|---|
| 11189 | + if (tp->pcierr_recovery || !netif_running(tp->dev)) { |
|---|
| 11189 | 11190 | tg3_flag_clear(tp, RESET_TASK_PENDING); |
|---|
| 11190 | 11191 | tg3_full_unlock(tp); |
|---|
| 11191 | 11192 | rtnl_unlock(); |
|---|
| .. | .. |
|---|
| 18179 | 18180 | |
|---|
| 18180 | 18181 | netdev_info(netdev, "PCI I/O error detected\n"); |
|---|
| 18181 | 18182 | |
|---|
| 18183 | + /* Want to make sure that the reset task doesn't run */ |
|---|
| 18184 | + tg3_reset_task_cancel(tp); |
|---|
| 18185 | + |
|---|
| 18182 | 18186 | rtnl_lock(); |
|---|
| 18183 | 18187 | |
|---|
| 18184 | 18188 | /* Could be second call or maybe we don't have netdev yet */ |
|---|
| .. | .. |
|---|
| 18194 | 18198 | tg3_netif_stop(tp); |
|---|
| 18195 | 18199 | |
|---|
| 18196 | 18200 | tg3_timer_stop(tp); |
|---|
| 18197 | | - |
|---|
| 18198 | | - /* Want to make sure that the reset task doesn't run */ |
|---|
| 18199 | | - tg3_reset_task_cancel(tp); |
|---|
| 18200 | 18201 | |
|---|
| 18201 | 18202 | netif_device_detach(netdev); |
|---|
| 18202 | 18203 | |
|---|