Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa2a8034 authored by Himanshu Madhani's avatar Himanshu Madhani Committed by David S. Miller
Browse files

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: default avatarHimanshu Madhani <himanshu.madhani@qlogic.com>
Signed-off-by: default avatarShahed Shaikh <shahed.shaikh@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 45ef92ed

drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c

+1 −4
Original line number Diff line number Diff line
@@ -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");

drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c

+15 −8
Original line number Diff line number Diff line
@@ -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-%s[Tx0+Rx%d]",

						 netdev->name, ring);

							 "qlcnic");

					else

						snprintf(sds_ring->name,

							 sizeof(sds_ring->name),

						 "qlcnic-%s[Rx%d]",

							 "%s-tx-0-rx-%d",

							 netdev->name, ring);

				} else {

					snprintf(sds_ring->name,

						 sizeof(sds_ring->name),

						 "%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)