git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
drivers
/
net
/
qlcnic
/
qlcnic_ctx.c
diff --git
a/drivers/net/qlcnic/qlcnic_ctx.c
b/drivers/net/qlcnic/qlcnic_ctx.c
index
bab041a
..
b0d32dd
100644
(file)
--- a/
drivers/net/qlcnic/qlcnic_ctx.c
+++ b/
drivers/net/qlcnic/qlcnic_ctx.c
@@
-95,8
+95,8
@@
int qlcnic_fw_cmd_get_minidump_temp(struct qlcnic_adapter *adapter)
QLCNIC_CDRP_CMD_TEMP_SIZE);
if (err != QLCNIC_RCODE_SUCCESS) {
err = QLCRD32(adapter, QLCNIC_ARG1_CRB_OFFSET);
QLCNIC_CDRP_CMD_TEMP_SIZE);
if (err != QLCNIC_RCODE_SUCCESS) {
err = QLCRD32(adapter, QLCNIC_ARG1_CRB_OFFSET);
- dev_
err
(&adapter->pdev->dev,
- "
Failed to
get template size %d\n", err);
+ dev_
info
(&adapter->pdev->dev,
+ "
Can't
get template size %d\n", err);
err = -EIO;
return err;
}
err = -EIO;
return err;
}
@@
-126,7
+126,7
@@
int qlcnic_fw_cmd_get_minidump_temp(struct qlcnic_adapter *adapter)
err = -EIO;
goto error;
}
err = -EIO;
goto error;
}
- tmp_tmpl =
(struct qlcnic_dump_template_hdr *)
tmp_addr;
+ tmp_tmpl = tmp_addr;
csum = qlcnic_temp_checksum((uint32_t *) tmp_addr, temp_size);
if (csum) {
dev_err(&adapter->pdev->dev,
csum = qlcnic_temp_checksum((uint32_t *) tmp_addr, temp_size);
if (csum) {
dev_err(&adapter->pdev->dev,
@@
-139,17
+139,14
@@
int qlcnic_fw_cmd_get_minidump_temp(struct qlcnic_adapter *adapter)
err = -EIO;
goto error;
}
err = -EIO;
goto error;
}
- tmp_buf =
(u32 *)
tmp_addr;
+ tmp_buf = tmp_addr;
template = (u32 *) ahw->fw_dump.tmpl_hdr;
for (i = 0; i < temp_size/sizeof(u32); i++)
*template++ = __le32_to_cpu(*tmp_buf++);
tmpl_hdr = ahw->fw_dump.tmpl_hdr;
template = (u32 *) ahw->fw_dump.tmpl_hdr;
for (i = 0; i < temp_size/sizeof(u32); i++)
*template++ = __le32_to_cpu(*tmp_buf++);
tmpl_hdr = ahw->fw_dump.tmpl_hdr;
- if (tmpl_hdr->cap_mask > QLCNIC_DUMP_MASK_DEF &&
- tmpl_hdr->cap_mask <= QLCNIC_DUMP_MASK_MAX)
- tmpl_hdr->drv_cap_mask = tmpl_hdr->cap_mask;
- else
- tmpl_hdr->drv_cap_mask = QLCNIC_DUMP_MASK_DEF;
+ tmpl_hdr->drv_cap_mask = QLCNIC_DUMP_MASK_DEF;
+ ahw->fw_dump.enable = 1;
error:
dma_free_coherent(&adapter->pdev->dev, temp_size, tmp_addr, tmp_addr_t);
return err;
error:
dma_free_coherent(&adapter->pdev->dev, temp_size, tmp_addr, tmp_addr_t);
return err;
@@
-214,7
+211,7
@@
qlcnic_fw_cmd_create_rx_ctx(struct qlcnic_adapter *adapter)
&hostrq_phys_addr, GFP_KERNEL);
if (addr == NULL)
return -ENOMEM;
&hostrq_phys_addr, GFP_KERNEL);
if (addr == NULL)
return -ENOMEM;
- prq =
(struct qlcnic_hostrq_rx_ctx *)
addr;
+ prq = addr;
addr = dma_alloc_coherent(&adapter->pdev->dev, rsp_size,
&cardrsp_phys_addr, GFP_KERNEL);
addr = dma_alloc_coherent(&adapter->pdev->dev, rsp_size,
&cardrsp_phys_addr, GFP_KERNEL);
@@
-222,7
+219,7
@@
qlcnic_fw_cmd_create_rx_ctx(struct qlcnic_adapter *adapter)
err = -ENOMEM;
goto out_free_rq;
}
err = -ENOMEM;
goto out_free_rq;
}
- prsp =
(struct qlcnic_cardrsp_rx_ctx *)
addr;
+ prsp = addr;
prq->host_rsp_dma_addr = cpu_to_le64(cardrsp_phys_addr);
prq->host_rsp_dma_addr = cpu_to_le64(cardrsp_phys_addr);
@@
-380,10
+377,10
@@
qlcnic_fw_cmd_create_tx_ctx(struct qlcnic_adapter *adapter)
}
memset(rq_addr, 0, rq_size);
}
memset(rq_addr, 0, rq_size);
- prq =
(struct qlcnic_hostrq_tx_ctx *)
rq_addr;
+ prq = rq_addr;
memset(rsp_addr, 0, rsp_size);
memset(rsp_addr, 0, rsp_size);
- prsp =
(struct qlcnic_cardrsp_tx_ctx *)
rsp_addr;
+ prsp = rsp_addr;
prq->host_rsp_dma_addr = cpu_to_le64(rsp_phys_addr);
prq->host_rsp_dma_addr = cpu_to_le64(rsp_phys_addr);
@@
-493,7
+490,7
@@
int qlcnic_alloc_hw_resources(struct qlcnic_adapter *adapter)
goto err_out_free;
}
goto err_out_free;
}
- tx_ring->desc_head =
(struct cmd_desc_type0 *)
addr;
+ tx_ring->desc_head = addr;
for (ring = 0; ring < adapter->max_rds_rings; ring++) {
rds_ring = &recv_ctx->rds_rings[ring];
for (ring = 0; ring < adapter->max_rds_rings; ring++) {
rds_ring = &recv_ctx->rds_rings[ring];
@@
-506,7
+503,7
@@
int qlcnic_alloc_hw_resources(struct qlcnic_adapter *adapter)
err = -ENOMEM;
goto err_out_free;
}
err = -ENOMEM;
goto err_out_free;
}
- rds_ring->desc_head =
(struct rcv_desc *)
addr;
+ rds_ring->desc_head = addr;
}
}
@@
-522,7
+519,7
@@
int qlcnic_alloc_hw_resources(struct qlcnic_adapter *adapter)
err = -ENOMEM;
goto err_out_free;
}
err = -ENOMEM;
goto err_out_free;
}
- sds_ring->desc_head =
(struct status_desc *)
addr;
+ sds_ring->desc_head = addr;
}
return 0;
}
return 0;
@@
-662,7
+659,7
@@
int qlcnic_get_nic_info(struct qlcnic_adapter *adapter,
return -ENOMEM;
memset(nic_info_addr, 0, nic_size);
return -ENOMEM;
memset(nic_info_addr, 0, nic_size);
- nic_info =
(struct qlcnic_info *)
nic_info_addr;
+ nic_info = nic_info_addr;
err = qlcnic_issue_cmd(adapter,
adapter->ahw->pci_func,
adapter->fw_hal_version,
err = qlcnic_issue_cmd(adapter,
adapter->ahw->pci_func,
adapter->fw_hal_version,
@@
-720,7
+717,7
@@
int qlcnic_set_nic_info(struct qlcnic_adapter *adapter, struct qlcnic_info *nic)
return -ENOMEM;
memset(nic_info_addr, 0, nic_size);
return -ENOMEM;
memset(nic_info_addr, 0, nic_size);
- nic_info =
(struct qlcnic_info *)
nic_info_addr;
+ nic_info = nic_info_addr;
nic_info->pci_func = cpu_to_le16(nic->pci_func);
nic_info->op_mode = cpu_to_le16(nic->op_mode);
nic_info->pci_func = cpu_to_le16(nic->pci_func);
nic_info->op_mode = cpu_to_le16(nic->op_mode);
@@
-769,7
+766,7
@@
int qlcnic_get_pci_info(struct qlcnic_adapter *adapter,
return -ENOMEM;
memset(pci_info_addr, 0, pci_size);
return -ENOMEM;
memset(pci_info_addr, 0, pci_size);
- npar =
(struct qlcnic_pci_info *)
pci_info_addr;
+ npar = pci_info_addr;
err = qlcnic_issue_cmd(adapter,
adapter->ahw->pci_func,
adapter->fw_hal_version,
err = qlcnic_issue_cmd(adapter,
adapter->ahw->pci_func,
adapter->fw_hal_version,
@@
-877,7
+874,7
@@
int qlcnic_get_port_stats(struct qlcnic_adapter *adapter, const u8 func,
QLCNIC_CDRP_CMD_GET_ESWITCH_STATS);
if (!err) {
QLCNIC_CDRP_CMD_GET_ESWITCH_STATS);
if (!err) {
- stats =
(struct __qlcnic_esw_statistics *)
stats_addr;
+ stats = stats_addr;
esw_stats->context_id = le16_to_cpu(stats->context_id);
esw_stats->version = le16_to_cpu(stats->version);
esw_stats->size = le16_to_cpu(stats->size);
esw_stats->context_id = le16_to_cpu(stats->context_id);
esw_stats->version = le16_to_cpu(stats->version);
esw_stats->size = le16_to_cpu(stats->size);