git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/avf: fix Tx offload mask
[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
000cd0b
..
c792e0b
100644
(file)
--- a/
drivers/net/sfc/sfc_rx.c
+++ b/
drivers/net/sfc/sfc_rx.c
@@
-1126,7
+1126,7
@@
sfc_rx_qfini(struct sfc_adapter *sa, unsigned int sw_index)
/*
* Mapping between RTE RSS hash functions and their EFX counterparts.
*/
/*
* Mapping between RTE RSS hash functions and their EFX counterparts.
*/
-struct sfc_rss_hf_rte_to_efx sfc_rss_hf_map[] = {
+st
atic const st
ruct sfc_rss_hf_rte_to_efx sfc_rss_hf_map[] = {
{ ETH_RSS_NONFRAG_IPV4_TCP,
EFX_RX_HASH(IPV4_TCP, 4TUPLE) },
{ ETH_RSS_NONFRAG_IPV4_UDP,
{ ETH_RSS_NONFRAG_IPV4_TCP,
EFX_RX_HASH(IPV4_TCP, 4TUPLE) },
{ ETH_RSS_NONFRAG_IPV4_UDP,
@@
-1504,7
+1504,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;
@@
-1541,6
+1541,7
@@
sfc_rx_configure(struct sfc_adapter *sa)
sa->rxq_count++;
}
sa->rxq_count++;
}
+configure_rss:
rss->channels = (dev_conf->rxmode.mq_mode == ETH_MQ_RX_RSS) ?
MIN(sa->rxq_count, EFX_MAXRSS) : 0;
rss->channels = (dev_conf->rxmode.mq_mode == ETH_MQ_RX_RSS) ?
MIN(sa->rxq_count, EFX_MAXRSS) : 0;
@@
-1557,7
+1558,6
@@
sfc_rx_configure(struct sfc_adapter *sa)
goto fail_rx_process_adv_conf_rss;
}
goto fail_rx_process_adv_conf_rss;
}
-done:
return 0;
fail_rx_process_adv_conf_rss:
return 0;
fail_rx_process_adv_conf_rss: