Code Review
/
deb_dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
New upstream version 17.11.5
[deb_dpdk.git]
/
drivers
/
net
/
sfc
/
sfc_rx.c
diff --git
a/drivers/net/sfc/sfc_rx.c
b/drivers/net/sfc/sfc_rx.c
index
8fc93d6
..
238aa5e
100644
(file)
--- a/
drivers/net/sfc/sfc_rx.c
+++ b/
drivers/net/sfc/sfc_rx.c
@@
-1028,6
+1028,7
@@
sfc_rx_qfini(struct sfc_adapter *sa, unsigned int sw_index)
struct sfc_rxq *rxq;
SFC_ASSERT(sw_index < sa->rxq_count);
struct sfc_rxq *rxq;
SFC_ASSERT(sw_index < sa->rxq_count);
+ sa->eth_dev->data->rx_queues[sw_index] = NULL;
rxq_info = &sa->rxq_info[sw_index];
rxq_info = &sa->rxq_info[sw_index];
@@
-1340,7
+1341,7
@@
sfc_rx_configure(struct sfc_adapter *sa)
goto fail_check_mode;
if (nb_rx_queues == sa->rxq_count)
goto fail_check_mode;
if (nb_rx_queues == sa->rxq_count)
- goto
done
;
+ goto
configure_rss
;
if (sa->rxq_info == NULL) {
rc = ENOMEM;
if (sa->rxq_info == NULL) {
rc = ENOMEM;
@@
-1377,6
+1378,7
@@
sfc_rx_configure(struct sfc_adapter *sa)
sa->rxq_count++;
}
sa->rxq_count++;
}
+configure_rss:
#if EFSYS_OPT_RX_SCALE
sa->rss_channels = (dev_conf->rxmode.mq_mode == ETH_MQ_RX_RSS) ?
MIN(sa->rxq_count, EFX_MAXRSS) : 0;
#if EFSYS_OPT_RX_SCALE
sa->rss_channels = (dev_conf->rxmode.mq_mode == ETH_MQ_RX_RSS) ?
MIN(sa->rxq_count, EFX_MAXRSS) : 0;
@@
-1395,7
+1397,6
@@
sfc_rx_configure(struct sfc_adapter *sa)
}
#endif
}
#endif
-done:
return 0;
fail_rx_process_adv_conf_rss:
return 0;
fail_rx_process_adv_conf_rss: