From patchwork Fri Mar 20 16:12:47 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stephen hemminger X-Patchwork-Id: 24756 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 30D1ADDDA9 for ; Sat, 21 Mar 2009 03:13:01 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754161AbZCTQM4 (ORCPT ); Fri, 20 Mar 2009 12:12:56 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753425AbZCTQMz (ORCPT ); Fri, 20 Mar 2009 12:12:55 -0400 Received: from mail.vyatta.com ([76.74.103.46]:40665 "EHLO mail.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752921AbZCTQMz (ORCPT ); Fri, 20 Mar 2009 12:12:55 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.vyatta.com (Postfix) with ESMTP id 5E3FB4F4204; Fri, 20 Mar 2009 09:12:56 -0700 (PDT) X-Virus-Scanned: amavisd-new at tahiti.vyatta.com Received: from mail.vyatta.com ([127.0.0.1]) by localhost (mail.vyatta.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id f4U8w5NNjr8Q; Fri, 20 Mar 2009 09:12:51 -0700 (PDT) Received: from nehalam (pool-71-117-208-104.ptldor.fios.verizon.net [71.117.208.104]) by mail.vyatta.com (Postfix) with ESMTP id 6AFA34F4193; Fri, 20 Mar 2009 09:12:51 -0700 (PDT) Date: Fri, 20 Mar 2009 09:12:47 -0700 From: Stephen Hemminger To: Stephen Hemminger Cc: Jeff Kirsher , David Miller , netdev@vger.kernel.org, e1000-devel@lists.sourceforge.net Subject: [PATCH 2/2] ixgbe: fix select_queue management (v2) Message-ID: <20090320091247.38326931@nehalam> In-Reply-To: <20090319233610.51fe4ee1@nehalam> References: <20090319233404.6697768b@nehalam> <20090319233610.51fe4ee1@nehalam> Organization: Vyatta X-Mailer: Claws Mail 3.6.1 (GTK+ 2.16.0; x86_64-pc-linux-gnu) Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Convert ixgbe to use net_device_ops properly. Rather than changing the select_queue function pointer just change number of available transmit queues. Signed-off-by: Stephen Hemminger --- drivers/net/ixgbe/ixgbe_dcb_nl.c | 48 +++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 27 deletions(-) -- 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 --- a/drivers/net/ixgbe/ixgbe_dcb_nl.c 2009-03-20 09:01:19.643651162 -0700 +++ b/drivers/net/ixgbe/ixgbe_dcb_nl.c 2009-03-20 09:11:09.645652169 -0700 @@ -102,12 +102,6 @@ static u8 ixgbe_dcbnl_get_state(struct n return !!(adapter->flags & IXGBE_FLAG_DCB_ENABLED); } -static u16 ixgbe_dcb_select_queue(struct net_device *dev, struct sk_buff *skb) -{ - /* All traffic should default to class 0 */ - return 0; -} - static u8 ixgbe_dcbnl_set_state(struct net_device *netdev, u8 state) { u8 err = 0; @@ -135,7 +129,7 @@ static u8 ixgbe_dcbnl_set_state(struct n kfree(adapter->rx_ring); adapter->tx_ring = NULL; adapter->rx_ring = NULL; - netdev->select_queue = &ixgbe_dcb_select_queue; + netdev->real_num_tx_queues = 1; adapter->flags &= ~IXGBE_FLAG_RSS_ENABLED; adapter->flags |= IXGBE_FLAG_DCB_ENABLED; @@ -147,6 +141,7 @@ static u8 ixgbe_dcbnl_set_state(struct n if (adapter->flags & IXGBE_FLAG_DCB_ENABLED) { if (netif_running(netdev)) netdev->netdev_ops->ndo_stop(netdev); + ixgbe_reset_interrupt_capability(adapter); ixgbe_napi_del_all(adapter); INIT_LIST_HEAD(&netdev->napi_list); @@ -154,7 +149,7 @@ static u8 ixgbe_dcbnl_set_state(struct n kfree(adapter->rx_ring); adapter->tx_ring = NULL; adapter->rx_ring = NULL; - netdev->select_queue = NULL; + netdev->real_num_tx_queues = MAX_TX_QUEUES; adapter->flags &= ~IXGBE_FLAG_DCB_ENABLED; adapter->flags |= IXGBE_FLAG_RSS_ENABLED;