openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qlcnic: Update IRQ name for 8200 and 8300 Series adapter. 

o Updated IRQ name for 8200 and 8300 Series adapter as per
  format used by other multiqueue drivers.

Signed-off-by: Himanshu Madhani <himanshu.madhani@qlogic.com>
Signed-off-by: Shahed Shaikh <shahed.shaikh@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Himanshu Madhani 2013-05-23 21:04:27 +00:00 committed by David S. Miller
parent 45ef92ed58
commit aa2a80340c
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
View File

@ -482,7 +482,6 @@ int qlcnic_83xx_setup_mbx_intr(struct qlcnic_adapter *adapter)
{ {
irq_handler_t handler; irq_handler_t handler;
u32 val; u32 val;
char name[32];
int err = 0; int err = 0;
unsigned long flags = 0; unsigned long flags = 0;
@ -493,9 +492,7 @@ int qlcnic_83xx_setup_mbx_intr(struct qlcnic_adapter *adapter)
if (adapter->flags & QLCNIC_MSIX_ENABLED) { if (adapter->flags & QLCNIC_MSIX_ENABLED) {
handler = qlcnic_83xx_handle_aen; handler = qlcnic_83xx_handle_aen;
val = adapter->msix_entries[adapter->ahw->num_msix - 1].vector; val = adapter->msix_entries[adapter->ahw->num_msix - 1].vector;
snprintf(name, (IFNAMSIZ + 4), err = request_irq(val, handler, flags, "qlcnic-MB", adapter);
"%s[%s]", "qlcnic", "aen");
err = request_irq(val, handler, flags, name, adapter);
if (err) { if (err) {
dev_err(&adapter->pdev->dev, dev_err(&adapter->pdev->dev,
"failed to register MBX interrupt\n"); "failed to register MBX interrupt\n");

23
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
View File

@ -1396,16 +1396,23 @@ qlcnic_request_irq(struct qlcnic_adapter *adapter)
for (ring = 0; ring < num_sds_rings; ring++) { for (ring = 0; ring < num_sds_rings; ring++) {
sds_ring = &recv_ctx->sds_rings[ring]; sds_ring = &recv_ctx->sds_rings[ring];
if (qlcnic_82xx_check(adapter) && if (qlcnic_82xx_check(adapter) &&
(ring == (num_sds_rings - 1))) (ring == (num_sds_rings - 1))) {
if (!(adapter->flags &
QLCNIC_MSIX_ENABLED))
snprintf(sds_ring->name,
sizeof(sds_ring->name),
"qlcnic");
else
snprintf(sds_ring->name,
sizeof(sds_ring->name),
"%s-tx-0-rx-%d",
netdev->name, ring);
} else {
snprintf(sds_ring->name, snprintf(sds_ring->name,
sizeof(sds_ring->name), sizeof(sds_ring->name),
"qlcnic-%s[Tx0+Rx%d]", "%s-rx-%d",
netdev->name, ring);
else
snprintf(sds_ring->name,
sizeof(sds_ring->name),
"qlcnic-%s[Rx%d]",
netdev->name, ring); netdev->name, ring);
}
err = request_irq(sds_ring->irq, handler, flags, err = request_irq(sds_ring->irq, handler, flags,
sds_ring->name, sds_ring); sds_ring->name, sds_ring);
if (err) if (err)
@ -1420,7 +1427,7 @@ qlcnic_request_irq(struct qlcnic_adapter *adapter)
ring++) { ring++) {
tx_ring = &adapter->tx_ring[ring]; tx_ring = &adapter->tx_ring[ring];
snprintf(tx_ring->name, sizeof(tx_ring->name), snprintf(tx_ring->name, sizeof(tx_ring->name),
"qlcnic-%s[Tx%d]", netdev->name, ring); "%s-tx-%d", netdev->name, ring);
err = request_irq(tx_ring->irq, handler, flags, err = request_irq(tx_ring->irq, handler, flags,
tx_ring->name, tx_ring); tx_ring->name, tx_ring);
if (err) if (err)