Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb13fc20 authored by Robert Olsson's avatar Robert Olsson Committed by David S. Miller
Browse files

ixgbe: Naming interrupt vectors 



Signed-off-by: default avatarRobert Olsson <robert.olsson@its.uu.se>
Acked-by: default avatarPeter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 70340d72

drivers/net/ixgbe/ixgbe_main.c

+14 −4
Original line number Diff line number Diff line
@@ -1207,6 +1207,7 @@ static int ixgbe_request_msix_irqs(struct ixgbe_adapter *adapter) 
	struct net_device *netdev = adapter->netdev;

	irqreturn_t (*handler)(int, void *);

	int i, vector, q_vectors, err;

	int ri=0, ti=0;



	/* Decrement for Other and TCP Timer vectors */

	q_vectors = adapter->num_msix_vectors - NON_Q_VECTORS;
@@ -1221,10 +1222,19 @@ static int ixgbe_request_msix_irqs(struct ixgbe_adapter *adapter) 
                         &ixgbe_msix_clean_many)

	for (vector = 0; vector < q_vectors; vector++) {

		handler = SET_HANDLER(&adapter->q_vector[vector]);

		sprintf(adapter->name[vector], "%s:v%d-%s",

		        netdev->name, vector,

		        (handler == &ixgbe_msix_clean_rx) ? "Rx" :

		         ((handler == &ixgbe_msix_clean_tx) ? "Tx" : "TxRx"));



		if(handler == &ixgbe_msix_clean_rx) {

			sprintf(adapter->name[vector], "%s-%s-%d",

				netdev->name, "rx", ri++);

		}

		else if(handler == &ixgbe_msix_clean_tx) {

			sprintf(adapter->name[vector], "%s-%s-%d",

				netdev->name, "tx", ti++);

		}

		else

			sprintf(adapter->name[vector], "%s-%s-%d",

				netdev->name, "TxRx", vector);



		err = request_irq(adapter->msix_entries[vector].vector,

		                  handler, 0, adapter->name[vector],

		                  &(adapter->q_vector[vector]));