“6dd4859b281700a163caec8ae7826c2558290127”上不存在“git@gitcode.net:openanolis/cloud-kernel.git”
提交 15eef1e1 编写于 作者: D Dhananjay Phadke 提交者: Jeff Garzik

netxen: fix dma watchdog

NX3031 does not require driver to kill dma watchdog.
Signed-off-by: NDhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: NJeff Garzik <jgarzik@redhat.com>
上级 922c4f2c
无相关合并请求
...@@ -1079,10 +1079,12 @@ int netxen_initialize_adapter_offload(struct netxen_adapter *adapter) ...@@ -1079,10 +1079,12 @@ int netxen_initialize_adapter_offload(struct netxen_adapter *adapter)
void netxen_free_adapter_offload(struct netxen_adapter *adapter) void netxen_free_adapter_offload(struct netxen_adapter *adapter)
{ {
int i; int i = 100;
if (!adapter->dummy_dma.addr)
return;
if (adapter->dummy_dma.addr) { if (NX_IS_REVISION_P2(adapter->ahw.revision_id)) {
i = 100;
do { do {
if (dma_watchdog_shutdown_request(adapter) == 1) if (dma_watchdog_shutdown_request(adapter) == 1)
break; break;
...@@ -1090,17 +1092,17 @@ void netxen_free_adapter_offload(struct netxen_adapter *adapter) ...@@ -1090,17 +1092,17 @@ void netxen_free_adapter_offload(struct netxen_adapter *adapter)
if (dma_watchdog_shutdown_poll_result(adapter) == 1) if (dma_watchdog_shutdown_poll_result(adapter) == 1)
break; break;
} while (--i); } while (--i);
}
if (i) { if (i) {
pci_free_consistent(adapter->pdev, pci_free_consistent(adapter->pdev,
NETXEN_HOST_DUMMY_DMA_SIZE, NETXEN_HOST_DUMMY_DMA_SIZE,
adapter->dummy_dma.addr, adapter->dummy_dma.addr,
adapter->dummy_dma.phys_addr); adapter->dummy_dma.phys_addr);
adapter->dummy_dma.addr = NULL; adapter->dummy_dma.addr = NULL;
} else { } else {
printk(KERN_ERR "%s: dma_watchdog_shutdown failed\n", printk(KERN_ERR "%s: dma_watchdog_shutdown failed\n",
adapter->netdev->name); adapter->netdev->name);
}
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册
反馈
建议
客服 返回
顶部