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>

2 files changed, 16 insertions, 12 deletions

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
index 9b91d6a231cb..9f5683fda801 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
@@ -482,7 +482,6 @@ int qlcnic_83xx_setup_mbx_intr(struct qlcnic_adapter *adapter)
 {
         irq_handler_t handler;
         u32 val;
-        char name[32];
         int err = 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) {
                 handler = qlcnic_83xx_handle_aen;
                 val = adapter->msix_entries[adapter->ahw->num_msix - 1].vector;
-                snprintf(name, (IFNAMSIZ + 4),
-                         "%s[%s]", "qlcnic", "aen");
-                err = request_irq(val, handler, flags, name, adapter);
+                err = request_irq(val, handler, flags, "qlcnic-MB", adapter);
                 if (err) {
                         dev_err(&adapter->pdev->dev,
                                 "failed to register MBX interrupt\n");
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index 1e196713c7d3..76b95b48c815 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -1396,16 +1396,23 @@ qlcnic_request_irq(struct qlcnic_adapter *adapter)
                         for (ring = 0; ring < num_sds_rings; ring++) {
                                 sds_ring = &recv_ctx->sds_rings[ring];
                                 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,
                                                  sizeof(sds_ring->name),
-                                                 "qlcnic-%s[Tx0+Rx%d]",
-                                                 netdev->name, ring);
-                                else
-                                        snprintf(sds_ring->name,
-                                                 sizeof(sds_ring->name),
-                                                 "qlcnic-%s[Rx%d]",
+                                                 "%s-rx-%d",
                                                  netdev->name, ring);
+                                }
                                 err = request_irq(sds_ring->irq, handler, flags,
                                                   sds_ring->name, sds_ring);
                                 if (err)
@@ -1420,7 +1427,7 @@ qlcnic_request_irq(struct qlcnic_adapter *adapter)
                              ring++) {
                                 tx_ring = &adapter->tx_ring[ring];
                                 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,
                                                   tx_ring->name, tx_ring);
                                 if (err)