diff options
author | Alexander Duyck <alexander.h.duyck@intel.com> | 2008-12-05 18:08:03 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-05 18:08:03 -0500 |
commit | cb7b48f671f9c7582993a6c0ff6e989078048561 (patch) | |
tree | 67b6a628e78eca1d14eba77b18562bc4a0db3181 /drivers/net/igb | |
parent | e061b165c7f4ec5e2e160d990b49011b5b6e5c6a (diff) |
igb/e1000e: Naming interrupt vectors
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>
Diffstat (limited to 'drivers/net/igb')
-rw-r--r-- | drivers/net/igb/igb_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index a08921e9cbe6..c49b8d8f80f2 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c | |||
@@ -446,7 +446,7 @@ static int igb_request_msix(struct igb_adapter *adapter) | |||
446 | 446 | ||
447 | for (i = 0; i < adapter->num_tx_queues; i++) { | 447 | for (i = 0; i < adapter->num_tx_queues; i++) { |
448 | struct igb_ring *ring = &(adapter->tx_ring[i]); | 448 | struct igb_ring *ring = &(adapter->tx_ring[i]); |
449 | sprintf(ring->name, "%s-tx%d", netdev->name, i); | 449 | sprintf(ring->name, "%s-tx-%d", netdev->name, i); |
450 | err = request_irq(adapter->msix_entries[vector].vector, | 450 | err = request_irq(adapter->msix_entries[vector].vector, |
451 | &igb_msix_tx, 0, ring->name, | 451 | &igb_msix_tx, 0, ring->name, |
452 | &(adapter->tx_ring[i])); | 452 | &(adapter->tx_ring[i])); |
@@ -459,7 +459,7 @@ static int igb_request_msix(struct igb_adapter *adapter) | |||
459 | for (i = 0; i < adapter->num_rx_queues; i++) { | 459 | for (i = 0; i < adapter->num_rx_queues; i++) { |
460 | struct igb_ring *ring = &(adapter->rx_ring[i]); | 460 | struct igb_ring *ring = &(adapter->rx_ring[i]); |
461 | if (strlen(netdev->name) < (IFNAMSIZ - 5)) | 461 | if (strlen(netdev->name) < (IFNAMSIZ - 5)) |
462 | sprintf(ring->name, "%s-rx%d", netdev->name, i); | 462 | sprintf(ring->name, "%s-rx-%d", netdev->name, i); |
463 | else | 463 | else |
464 | memcpy(ring->name, netdev->name, IFNAMSIZ); | 464 | memcpy(ring->name, netdev->name, IFNAMSIZ); |
465 | err = request_irq(adapter->msix_entries[vector].vector, | 465 | err = request_irq(adapter->msix_entries[vector].vector, |