|
@@ -3105,23 +3105,23 @@ int ixgbe_poll(struct napi_struct *napi, int budget)
|
|
|
static int ixgbe_request_msix_irqs(struct ixgbe_adapter *adapter)
|
|
|
{
|
|
|
struct net_device *netdev = adapter->netdev;
|
|
|
+ unsigned int ri = 0, ti = 0;
|
|
|
int vector, err;
|
|
|
- int ri = 0, ti = 0;
|
|
|
|
|
|
for (vector = 0; vector < adapter->num_q_vectors; vector++) {
|
|
|
struct ixgbe_q_vector *q_vector = adapter->q_vector[vector];
|
|
|
struct msix_entry *entry = &adapter->msix_entries[vector];
|
|
|
|
|
|
if (q_vector->tx.ring && q_vector->rx.ring) {
|
|
|
- snprintf(q_vector->name, sizeof(q_vector->name) - 1,
|
|
|
- "%s-%s-%d", netdev->name, "TxRx", ri++);
|
|
|
+ snprintf(q_vector->name, sizeof(q_vector->name),
|
|
|
+ "%s-TxRx-%u", netdev->name, ri++);
|
|
|
ti++;
|
|
|
} else if (q_vector->rx.ring) {
|
|
|
- snprintf(q_vector->name, sizeof(q_vector->name) - 1,
|
|
|
- "%s-%s-%d", netdev->name, "rx", ri++);
|
|
|
+ snprintf(q_vector->name, sizeof(q_vector->name),
|
|
|
+ "%s-rx-%u", netdev->name, ri++);
|
|
|
} else if (q_vector->tx.ring) {
|
|
|
- snprintf(q_vector->name, sizeof(q_vector->name) - 1,
|
|
|
- "%s-%s-%d", netdev->name, "tx", ti++);
|
|
|
+ snprintf(q_vector->name, sizeof(q_vector->name),
|
|
|
+ "%s-tx-%u", netdev->name, ti++);
|
|
|
} else {
|
|
|
/* skip this unused q_vector */
|
|
|
continue;
|