From patchwork Fri Mar 24 17:16:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joao Pinto X-Patchwork-Id: 743293 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.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vqVTV6XfXz9s7N for ; Sat, 25 Mar 2017 04:17:02 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966912AbdCXRRB (ORCPT ); Fri, 24 Mar 2017 13:17:01 -0400 Received: from us01smtprelay-2.synopsys.com ([198.182.47.9]:48773 "EHLO smtprelay.synopsys.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966906AbdCXRQ5 (ORCPT ); Fri, 24 Mar 2017 13:16:57 -0400 Received: from mailhost.synopsys.com (mailhost1.synopsys.com [10.12.238.239]) by smtprelay.synopsys.com (Postfix) with ESMTP id A281924E0017; Fri, 24 Mar 2017 10:16:56 -0700 (PDT) Received: from mailhost.synopsys.com (localhost [127.0.0.1]) by mailhost.synopsys.com (Postfix) with ESMTP id 8D5AEBF6; Fri, 24 Mar 2017 10:16:56 -0700 (PDT) Received: from jpinto-box.internal.synopsys.com (jpinto-box.internal.synopsys.com [10.107.19.150]) by mailhost.synopsys.com (Postfix) with ESMTP id 4A67EBDC; Fri, 24 Mar 2017 10:16:54 -0700 (PDT) From: Joao Pinto To: davem@davemloft.net Cc: peppe.cavallaro@st.com, alexandre.torgue@st.com, clabbe.montjoie@gmail.com, thierry.reding@gmail.com, sergei.shtylyov@cogentembedded.com, f.fainelli@gmail.com, niklas.cassel@axis.com, netdev@vger.kernel.org, Joao Pinto Subject: [PATCH net-next 2/2] net: stmmac: fix number of tx queues in stmmac_poll Date: Fri, 24 Mar 2017 17:16:45 +0000 Message-Id: X-Mailer: git-send-email 2.9.3 In-Reply-To: References: In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org For cores that have more than 1 TX queue configured, the kernel would crash, since only one TX queue is permitted by default. Signed-off-by: Joao Pinto --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 3827952..1eab084 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -3429,7 +3429,7 @@ static int stmmac_poll(struct napi_struct *napi, int budget) struct stmmac_rx_queue *rx_q = container_of(napi, struct stmmac_rx_queue, napi); struct stmmac_priv *priv = rx_q->priv_data; - u32 tx_count = priv->dma_cap.number_tx_queues; + u32 tx_count = priv->plat->tx_queues_to_use; u32 chan = rx_q->queue_index; u32 work_done = 0; u32 queue = 0;