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

Commit cb7b48f6 authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller
Browse files

igb/e1000e: Naming interrupt vectors 



Change interrupt vector naming to match recent changes from Robert Olsson.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Acked-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e061b165

drivers/net/e1000e/netdev.c

+2 −2
Original line number Diff line number Diff line
@@ -1478,7 +1478,7 @@ static int e1000_request_msix(struct e1000_adapter *adapter) 
	int err = 0, vector = 0;



	if (strlen(netdev->name) < (IFNAMSIZ - 5))

		sprintf(adapter->rx_ring->name, "%s-rx0", netdev->name);

		sprintf(adapter->rx_ring->name, "%s-rx-0", netdev->name);

	else

		memcpy(adapter->rx_ring->name, netdev->name, IFNAMSIZ);

	err = request_irq(adapter->msix_entries[vector].vector,
@@ -1491,7 +1491,7 @@ static int e1000_request_msix(struct e1000_adapter *adapter) 
	vector++;



	if (strlen(netdev->name) < (IFNAMSIZ - 5))

		sprintf(adapter->tx_ring->name, "%s-tx0", netdev->name);

		sprintf(adapter->tx_ring->name, "%s-tx-0", netdev->name);

	else

		memcpy(adapter->tx_ring->name, netdev->name, IFNAMSIZ);

	err = request_irq(adapter->msix_entries[vector].vector,

drivers/net/igb/igb_main.c

+2 −2
Original line number Diff line number Diff line
@@ -446,7 +446,7 @@ static int igb_request_msix(struct igb_adapter *adapter) 


	for (i = 0; i < adapter->num_tx_queues; i++) {

		struct igb_ring *ring = &(adapter->tx_ring[i]);

		sprintf(ring->name, "%s-tx%d", netdev->name, i);

		sprintf(ring->name, "%s-tx-%d", netdev->name, i);

		err = request_irq(adapter->msix_entries[vector].vector,

				  &igb_msix_tx, 0, ring->name,

				  &(adapter->tx_ring[i]));
@@ -459,7 +459,7 @@ static int igb_request_msix(struct igb_adapter *adapter) 
	for (i = 0; i < adapter->num_rx_queues; i++) {

		struct igb_ring *ring = &(adapter->rx_ring[i]);

		if (strlen(netdev->name) < (IFNAMSIZ - 5))

			sprintf(ring->name, "%s-rx%d", netdev->name, i);

			sprintf(ring->name, "%s-rx-%d", netdev->name, i);

		else

			memcpy(ring->name, netdev->name, IFNAMSIZ);

		err = request_irq(adapter->msix_entries[vector].vector,