From patchwork Tue Nov 25 15:49:07 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Olsson X-Patchwork-Id: 10652 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 7D97FDDF20 for ; Wed, 26 Nov 2008 02:49:15 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751553AbYKYPtL (ORCPT ); Tue, 25 Nov 2008 10:49:11 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751287AbYKYPtJ (ORCPT ); Tue, 25 Nov 2008 10:49:09 -0500 Received: from robur.slu.se ([130.238.98.12]:55659 "EHLO robur.slu.se" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751193AbYKYPtI (ORCPT ); Tue, 25 Nov 2008 10:49:08 -0500 Received: by robur.slu.se (Postfix, from userid 1000) id 811A5EC04C; Tue, 25 Nov 2008 16:49:07 +0100 (CET) From: Robert Olsson MIME-Version: 1.0 Message-ID: <18732.7795.484291.202338@robur.slu.se> Date: Tue, 25 Nov 2008 16:49:07 +0100 To: David Miller Cc: netdev@vger.kernel.org, Robert.Olsson@data.slu.se Subject: [PATCH] Naming interrupt vectors/ixgbe X-Mailer: VM 7.19 under Emacs 22.2.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Same syntax for ixgbe driver. Cheers --ro Signed-off-by: Robert Olsson Acked-by: Peter P Waskiewicz Jr --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 7548fb7..88717e6 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c @@ -1187,6 +1187,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; @@ -1201,10 +1202,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]));