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/ice: merge inner/outer seg info for flow director
[dpdk.git]
/
drivers
/
net
/
ice
/
ice_dcf_ethdev.c
diff --git
a/drivers/net/ice/ice_dcf_ethdev.c
b/drivers/net/ice/ice_dcf_ethdev.c
index
38e321f
..
2faed3c
100644
(file)
--- a/
drivers/net/ice/ice_dcf_ethdev.c
+++ b/
drivers/net/ice/ice_dcf_ethdev.c
@@
-230,7
+230,7
@@
ice_dcf_config_rx_queues_irqs(struct rte_eth_dev *dev,
static int
alloc_rxq_mbufs(struct ice_rx_queue *rxq)
{
static int
alloc_rxq_mbufs(struct ice_rx_queue *rxq)
{
- volatile union ice_
32b_
rx_flex_desc *rxd;
+ volatile union ice_rx_flex_desc *rxd;
struct rte_mbuf *mbuf = NULL;
uint64_t dma_addr;
uint16_t i;
struct rte_mbuf *mbuf = NULL;
uint64_t dma_addr;
uint16_t i;
@@
-254,8
+254,10
@@
alloc_rxq_mbufs(struct ice_rx_queue *rxq)
rxd = &rxq->rx_ring[i];
rxd->read.pkt_addr = dma_addr;
rxd->read.hdr_addr = 0;
rxd = &rxq->rx_ring[i];
rxd->read.pkt_addr = dma_addr;
rxd->read.hdr_addr = 0;
+#ifndef RTE_LIBRTE_ICE_16BYTE_RX_DESC
rxd->read.rsvd1 = 0;
rxd->read.rsvd2 = 0;
rxd->read.rsvd1 = 0;
rxd->read.rsvd2 = 0;
+#endif
rxq->sw_ring[i].mbuf = (void *)mbuf;
}
rxq->sw_ring[i].mbuf = (void *)mbuf;
}
@@
-544,6
+546,12
@@
ice_dcf_dev_start(struct rte_eth_dev *dev)
return ret;
}
return ret;
}
+ ret = ice_dcf_add_del_all_mac_addr(hw, true);
+ if (ret) {
+ PMD_DRV_LOG(ERR, "Failed to add mac addr");
+ return ret;
+ }
+
dev->data->dev_link.link_status = ETH_LINK_UP;
return 0;
dev->data->dev_link.link_status = ETH_LINK_UP;
return 0;
@@
-601,6
+609,7
@@
ice_dcf_dev_stop(struct rte_eth_dev *dev)
intr_handle->intr_vec = NULL;
}
intr_handle->intr_vec = NULL;
}
+ ice_dcf_add_del_all_mac_addr(&dcf_ad->real_hw, false);
dev->data->dev_link.link_status = ETH_LINK_DOWN;
ad->pf.adapter_stopped = 1;
}
dev->data->dev_link.link_status = ETH_LINK_DOWN;
ad->pf.adapter_stopped = 1;
}