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/e1000e/netdev.c | |
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/e1000e/netdev.c')
-rw-r--r-- | drivers/net/e1000e/netdev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index 65fd9797d028..a4278bbf560c 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c | |||
@@ -1478,7 +1478,7 @@ static int e1000_request_msix(struct e1000_adapter *adapter) | |||
1478 | int err = 0, vector = 0; | 1478 | int err = 0, vector = 0; |
1479 | 1479 | ||
1480 | if (strlen(netdev->name) < (IFNAMSIZ - 5)) | 1480 | if (strlen(netdev->name) < (IFNAMSIZ - 5)) |
1481 | sprintf(adapter->rx_ring->name, "%s-rx0", netdev->name); | 1481 | sprintf(adapter->rx_ring->name, "%s-rx-0", netdev->name); |
1482 | else | 1482 | else |
1483 | memcpy(adapter->rx_ring->name, netdev->name, IFNAMSIZ); | 1483 | memcpy(adapter->rx_ring->name, netdev->name, IFNAMSIZ); |
1484 | err = request_irq(adapter->msix_entries[vector].vector, | 1484 | err = request_irq(adapter->msix_entries[vector].vector, |
@@ -1491,7 +1491,7 @@ static int e1000_request_msix(struct e1000_adapter *adapter) | |||
1491 | vector++; | 1491 | vector++; |
1492 | 1492 | ||
1493 | if (strlen(netdev->name) < (IFNAMSIZ - 5)) | 1493 | if (strlen(netdev->name) < (IFNAMSIZ - 5)) |
1494 | sprintf(adapter->tx_ring->name, "%s-tx0", netdev->name); | 1494 | sprintf(adapter->tx_ring->name, "%s-tx-0", netdev->name); |
1495 | else | 1495 | else |
1496 | memcpy(adapter->tx_ring->name, netdev->name, IFNAMSIZ); | 1496 | memcpy(adapter->tx_ring->name, netdev->name, IFNAMSIZ); |
1497 | err = request_irq(adapter->msix_entries[vector].vector, | 1497 | err = request_irq(adapter->msix_entries[vector].vector, |