From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by dpdk.org (Postfix) with ESMTP id 713F1235 for ; Tue, 21 Nov 2017 14:21:02 +0100 (CET) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 258DC20A9C; Tue, 21 Nov 2017 08:21:02 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute1.internal (MEProxy); Tue, 21 Nov 2017 08:21:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux.org; h=cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=3hXVzMphBo4bZP/7Y udTN07n4vYuLi9bjc6UG2nibKc=; b=Oeg3Sh/chnYYbWsk4pgCDqGC4Xjcbubqz fLdv23iMm/wN5DrJrFTv1Y8DwkovwfHQWVcqg7dnpNoHNJlhwHT00+/3nBCu9HPE JUxbPQFvFsxMkblLlSS3UngNwVhdZH/9VCBw/jYtHSpN1TsXdSIxESOgnspwKfch JThOGwqrEaJK9+ehXLkEFpGfVSUMd0Kqjs0dOfwIOyTOU3B7dTNJ0gdwi6A9vBd2 mUQ44sF98kPByO3HPByIDzXU+v02ddvpJLcNckr8ElfjIGKXOnzFR/6hG8ZnyiUk kJILItBmVvw1tgwxjZAomNl7J7SM4KCGD1osbcZ55tn2rDCreGP6g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=3hXVzMphBo4bZP/7YudTN07n4vYuLi9bjc6UG2nibKc=; b=P7j5yY/Q JghLgJXgxWGHThN/guRGPFcLEGKSyPFbDk15lPFaE1zJSGl5l4JTUBCtMOESYwkg Z337tzWMFhaU8gk1s4FOakfBE0o6pK+RN7+1hq9lPt3pSXfYpaD8dMJXHEOANm5f nUA2CDffC5Rj2TtG+BiJKSf0ZfIGXbcHVpAs2ee9f1ni4XdoPF1ZrrmFnMgscTmC cHqPdugRZBJLABguwIVQ7VuJp5uyPLekOdojcyFEdgNvPcw9j7yc0iOQlb7POcF+ woDrpx6tyJ9TZWiYH/VqfOiH7xQMl0x6XmN5DHPbNPk9urPaitIy2MtUjKfJMnUw WFHJ2NjcYVNbYw== X-ME-Sender: Received: from localhost.localdomain (unknown [180.158.62.0]) by mail.messagingengine.com (Postfix) with ESMTPA id AA4ED247A9; Tue, 21 Nov 2017 08:20:57 -0500 (EST) From: Yuanhan Liu To: Ivan Malov Cc: Andrew Rybchenko , dpdk stable Date: Tue, 21 Nov 2017 21:16:08 +0800 Message-Id: <1511270333-31002-26-git-send-email-yliu@fridaylinux.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511270333-31002-1-git-send-email-yliu@fridaylinux.org> References: <1511270333-31002-1-git-send-email-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'net/sfc: fix unused variable in RSS-agnostic build' has been queued to stable release 17.08.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Nov 2017 13:21:02 -0000 Hi, FYI, your patch has been queued to stable release 17.08.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/24/17. So please shout if anyone has objections. Thanks. --yliu --- >>From 6539077e8b646d63ffb121545eeb37aa7774aab1 Mon Sep 17 00:00:00 2001 From: Ivan Malov Date: Wed, 30 Aug 2017 19:17:31 +0100 Subject: [PATCH] net/sfc: fix unused variable in RSS-agnostic build [ upstream commit 879b01bdfa90c739337d59b9b0f89f1ed8d5f160 ] Unused variables will be found in several places if RSS support is disabled at build time; the patch is to fix it Fixes: 4ec1fc3ba881 ("net/sfc: add basic stubs for RSS support on driver attach") Fixes: d9ff551fc974 ("net/sfc: support RSS hash offload") Signed-off-by: Ivan Malov Signed-off-by: Andrew Rybchenko --- drivers/net/sfc/sfc.c | 8 ++++++-- drivers/net/sfc/sfc_rx.c | 24 +++++++++++++++++++----- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/drivers/net/sfc/sfc.c b/drivers/net/sfc/sfc.c index 6cecfc0..7849a1c 100644 --- a/drivers/net/sfc/sfc.c +++ b/drivers/net/sfc/sfc.c @@ -510,10 +510,10 @@ static const uint8_t default_rss_key[SFC_RSS_KEY_SIZE] = { }; #endif +#if EFSYS_OPT_RX_SCALE static int sfc_set_rss_defaults(struct sfc_adapter *sa) { -#if EFSYS_OPT_RX_SCALE int rc; rc = efx_intr_init(sa->nic, sa->intr.type, NULL); @@ -556,10 +556,14 @@ fail_ev_init: fail_intr_init: return rc; +} #else +static int +sfc_set_rss_defaults(__rte_unused struct sfc_adapter *sa) +{ return 0; -#endif } +#endif int sfc_attach(struct sfc_adapter *sa) diff --git a/drivers/net/sfc/sfc_rx.c b/drivers/net/sfc/sfc_rx.c index 364f718..be46b23 100644 --- a/drivers/net/sfc/sfc_rx.c +++ b/drivers/net/sfc/sfc_rx.c @@ -207,11 +207,11 @@ sfc_efx_supported_ptypes_get(void) return ptypes; } +#if EFSYS_OPT_RX_SCALE static void sfc_efx_rx_set_rss_hash(struct sfc_efx_rxq *rxq, unsigned int flags, struct rte_mbuf *m) { -#if EFSYS_OPT_RX_SCALE uint8_t *mbuf_data; @@ -227,8 +227,15 @@ sfc_efx_rx_set_rss_hash(struct sfc_efx_rxq *rxq, unsigned int flags, m->ol_flags |= PKT_RX_RSS_HASH; } -#endif } +#else +static void +sfc_efx_rx_set_rss_hash(__rte_unused struct sfc_efx_rxq *rxq, + __rte_unused unsigned int flags, + __rte_unused struct rte_mbuf *m) +{ +} +#endif static uint16_t sfc_efx_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) @@ -1050,12 +1057,12 @@ sfc_efx_to_rte_hash_type(efx_rx_hash_type_t efx_hash_types) } #endif +#if EFSYS_OPT_RX_SCALE static int sfc_rx_rss_config(struct sfc_adapter *sa) { int rc = 0; -#if EFSYS_OPT_RX_SCALE if (sa->rss_channels > 0) { rc = efx_rx_scale_mode_set(sa->nic, EFX_RX_HASHALG_TOEPLITZ, sa->rss_hash_types, B_TRUE); @@ -1072,9 +1079,15 @@ sfc_rx_rss_config(struct sfc_adapter *sa) } finish: -#endif return rc; } +#else +static int +sfc_rx_rss_config(__rte_unused struct sfc_adapter *sa) +{ + return 0; +} +#endif int sfc_rx_start(struct sfc_adapter *sa) @@ -1243,7 +1256,6 @@ sfc_rx_configure(struct sfc_adapter *sa) { struct rte_eth_conf *dev_conf = &sa->eth_dev->data->dev_conf; const unsigned int nb_rx_queues = sa->eth_dev->data->nb_rx_queues; - unsigned int sw_index; int rc; sfc_log_init(sa, "nb_rx_queues=%u (old %u)", @@ -1296,6 +1308,8 @@ sfc_rx_configure(struct sfc_adapter *sa) MIN(sa->rxq_count, EFX_MAXRSS) : 0; if (sa->rss_channels > 0) { + unsigned int sw_index; + for (sw_index = 0; sw_index < EFX_RSS_TBL_SIZE; ++sw_index) sa->rss_tbl[sw_index] = sw_index % sa->rss_channels; } -- 2.7.4