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>

2 files changed, 4 insertions, 4 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)
         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,
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)
 
         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,