evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

igb/e1000e: Naming interrupt vectors

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

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Acked-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Alexander Duyck 2008-12-05 15:08:03 -08:00 • committed by David S. Miller
parent e061b165c7
commit cb7b48f671
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/net/e1000e/netdev.c
View file

@ -1478,7 +1478,7 @@ static int e1000_request_msix(struct e1000_adapter *adapter)
int err = 0, vector = 0; int err = 0, vector = 0;
if (strlen(netdev->name) < (IFNAMSIZ - 5)) 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 else
memcpy(adapter->rx_ring->name, netdev->name, IFNAMSIZ); memcpy(adapter->rx_ring->name, netdev->name, IFNAMSIZ);
err = request_irq(adapter->msix_entries[vector].vector, err = request_irq(adapter->msix_entries[vector].vector,
@ -1491,7 +1491,7 @@ static int e1000_request_msix(struct e1000_adapter *adapter)
vector++; vector++;
if (strlen(netdev->name) < (IFNAMSIZ - 5)) 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 else
memcpy(adapter->tx_ring->name, netdev->name, IFNAMSIZ); memcpy(adapter->tx_ring->name, netdev->name, IFNAMSIZ);
err = request_irq(adapter->msix_entries[vector].vector, err = request_irq(adapter->msix_entries[vector].vector,

4
drivers/net/igb/igb_main.c
View file

@ -446,7 +446,7 @@ static int igb_request_msix(struct igb_adapter *adapter)
for (i = 0; i < adapter->num_tx_queues; i++) { for (i = 0; i < adapter->num_tx_queues; i++) {
struct igb_ring *ring = &(adapter->tx_ring[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, err = request_irq(adapter->msix_entries[vector].vector,
&igb_msix_tx, 0, ring->name, &igb_msix_tx, 0, ring->name,
&(adapter->tx_ring[i])); &(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++) { for (i = 0; i < adapter->num_rx_queues; i++) {
struct igb_ring *ring = &(adapter->rx_ring[i]); struct igb_ring *ring = &(adapter->rx_ring[i]);
if (strlen(netdev->name) < (IFNAMSIZ - 5)) 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 else
memcpy(ring->name, netdev->name, IFNAMSIZ); memcpy(ring->name, netdev->name, IFNAMSIZ);
err = request_irq(adapter->msix_entries[vector].vector, err = request_irq(adapter->msix_entries[vector].vector,