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")
Cc: stable@dpdk.org
Signed-off-by: Ivan Malov <ivan.malov@oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
static int
sfc_set_rss_defaults(struct sfc_adapter *sa)
{
static int
sfc_set_rss_defaults(struct sfc_adapter *sa)
{
int rc;
rc = efx_intr_init(sa->nic, sa->intr.type, NULL);
int rc;
rc = efx_intr_init(sa->nic, sa->intr.type, NULL);
fail_intr_init:
return rc;
fail_intr_init:
return rc;
+static int
+sfc_set_rss_defaults(__rte_unused struct sfc_adapter *sa)
+{
int
sfc_attach(struct sfc_adapter *sa)
int
sfc_attach(struct sfc_adapter *sa)
static void
sfc_efx_rx_set_rss_hash(struct sfc_efx_rxq *rxq, unsigned int flags,
struct rte_mbuf *m)
{
static void
sfc_efx_rx_set_rss_hash(struct sfc_efx_rxq *rxq, unsigned int flags,
struct rte_mbuf *m)
{
m->ol_flags |= PKT_RX_RSS_HASH;
}
m->ol_flags |= PKT_RX_RSS_HASH;
}
+#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)
static uint16_t
sfc_efx_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)
static int
sfc_rx_rss_config(struct sfc_adapter *sa)
{
int rc = 0;
static int
sfc_rx_rss_config(struct sfc_adapter *sa)
{
int rc = 0;
if (sa->rss_channels > 0) {
rc = efx_rx_scale_mode_set(sa->nic, EFX_RX_HASHALG_TOEPLITZ,
sa->rss_hash_types, B_TRUE);
if (sa->rss_channels > 0) {
rc = efx_rx_scale_mode_set(sa->nic, EFX_RX_HASHALG_TOEPLITZ,
sa->rss_hash_types, B_TRUE);
+#else
+static int
+sfc_rx_rss_config(__rte_unused struct sfc_adapter *sa)
+{
+ return 0;
+}
+#endif
int
sfc_rx_start(struct sfc_adapter *sa)
int
sfc_rx_start(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;
{
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;
int rc;
sfc_log_init(sa, "nb_rx_queues=%u (old %u)",
int rc;
sfc_log_init(sa, "nb_rx_queues=%u (old %u)",
MIN(sa->rxq_count, EFX_MAXRSS) : 0;
if (sa->rss_channels > 0) {
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;
}
for (sw_index = 0; sw_index < EFX_RSS_TBL_SIZE; ++sw_index)
sa->rss_tbl[sw_index] = sw_index % sa->rss_channels;
}