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/mlx5: rearrange creation of WQ and CQ object
[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
10fa1e5
..
a62ce4a
100644
(file)
--- a/
drivers/net/sfc/sfc_rx.c
+++ b/
drivers/net/sfc/sfc_rx.c
@@
-1,7
+1,7
@@
/* SPDX-License-Identifier: BSD-3-Clause
*
/* SPDX-License-Identifier: BSD-3-Clause
*
- * Copyright
(c) 2016-2018 Solarflare Communications
Inc.
- *
All rights reserved
.
+ * Copyright
(c) 2019-2020 Xilinx,
Inc.
+ *
Copyright(c) 2016-2019 Solarflare Communications Inc
.
*
* This software was jointly developed between OKTET Labs (under contract
* for Solarflare) and Solarflare Communications, Inc.
*
* This software was jointly developed between OKTET Labs (under contract
* for Solarflare) and Solarflare Communications, Inc.
@@
-719,7
+719,8
@@
retry:
sfc_warn(sa, "promiscuous mode will be disabled");
port->promisc = B_FALSE;
sfc_warn(sa, "promiscuous mode will be disabled");
port->promisc = B_FALSE;
- rc = sfc_set_rx_mode(sa);
+ sa->eth_dev->data->promiscuous = 0;
+ rc = sfc_set_rx_mode_unchecked(sa);
if (rc != 0)
return rc;
if (rc != 0)
return rc;
@@
-732,7
+733,8
@@
retry:
sfc_warn(sa, "all-multicast mode will be disabled");
port->allmulti = B_FALSE;
sfc_warn(sa, "all-multicast mode will be disabled");
port->allmulti = B_FALSE;
- rc = sfc_set_rx_mode(sa);
+ sa->eth_dev->data->all_multicast = 0;
+ rc = sfc_set_rx_mode_unchecked(sa);
if (rc != 0)
return rc;
if (rc != 0)
return rc;
@@
-820,10
+822,12
@@
sfc_rx_qstart(struct sfc_adapter *sa, unsigned int sw_index)
return 0;
fail_mac_filter_default_rxq_set:
return 0;
fail_mac_filter_default_rxq_set:
+ sfc_rx_qflush(sa, sw_index);
sa->priv.dp_rx->qstop(rxq_info->dp, &rxq->evq->read_ptr);
sa->priv.dp_rx->qstop(rxq_info->dp, &rxq->evq->read_ptr);
+ rxq_info->state = SFC_RXQ_INITIALIZED;
fail_dp_qstart:
fail_dp_qstart:
-
sfc_rx_qflush(sa, sw_index
);
+
efx_rx_qdestroy(rxq->common
);
fail_rx_qcreate:
fail_bad_contig_block_size:
fail_rx_qcreate:
fail_bad_contig_block_size:
@@
-1403,7
+1407,7
@@
sfc_rx_process_adv_conf_rss(struct sfc_adapter *sa,
if (conf->rss_key != NULL) {
if (conf->rss_key_len != sizeof(rss->key)) {
if (conf->rss_key != NULL) {
if (conf->rss_key_len != sizeof(rss->key)) {
- sfc_err(sa, "RSS key size is wrong (should be %
l
u)",
+ sfc_err(sa, "RSS key size is wrong (should be %
z
u)",
sizeof(rss->key));
return EINVAL;
}
sizeof(rss->key));
return EINVAL;
}
@@
-1557,10
+1561,6
@@
sfc_rx_check_mode(struct sfc_adapter *sa, struct rte_eth_rxmode *rxmode)
rxmode->offloads |= DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM;
}
rxmode->offloads |= DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM;
}
- if ((offloads_supported & DEV_RX_OFFLOAD_RSS_HASH) &&
- (~rxmode->offloads & DEV_RX_OFFLOAD_RSS_HASH))
- rxmode->offloads |= DEV_RX_OFFLOAD_RSS_HASH;
-
return rc;
}
return rc;
}