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
app/eventdev: add ethernet device setup helpers
[dpdk.git]
/
drivers
/
net
/
mlx5
/
mlx5_vlan.c
diff --git
a/drivers/net/mlx5/mlx5_vlan.c
b/drivers/net/mlx5/mlx5_vlan.c
index
89874aa
..
9443e4f
100644
(file)
--- a/
drivers/net/mlx5/mlx5_vlan.c
+++ b/
drivers/net/mlx5/mlx5_vlan.c
@@
-61,6
+61,7
@@
mlx5_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
{
struct priv *priv = dev->data->dev_private;
unsigned int i;
{
struct priv *priv = dev->data->dev_private;
unsigned int i;
+ int ret = 0;
priv_lock(priv);
DEBUG("%p: %s VLAN filter ID %" PRIu16,
priv_lock(priv);
DEBUG("%p: %s VLAN filter ID %" PRIu16,
@@
-69,6
+70,11
@@
mlx5_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
for (i = 0; (i != priv->vlan_filter_n); ++i)
if (priv->vlan_filter[i] == vlan_id)
break;
for (i = 0; (i != priv->vlan_filter_n); ++i)
if (priv->vlan_filter[i] == vlan_id)
break;
+ /* Check if there's room for another VLAN filter. */
+ if (i == RTE_DIM(priv->vlan_filter)) {
+ ret = -ENOMEM;
+ goto out;
+ }
if (i < priv->vlan_filter_n) {
assert(priv->vlan_filter_n != 0);
/* Enabling an existing VLAN filter has no effect. */
if (i < priv->vlan_filter_n) {
assert(priv->vlan_filter_n != 0);
/* Enabling an existing VLAN filter has no effect. */
@@
-94,7
+100,7
@@
mlx5_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on)
priv_dev_traffic_restart(priv, dev);
out:
priv_unlock(priv);
priv_dev_traffic_restart(priv, dev);
out:
priv_unlock(priv);
- return
0
;
+ return
ret
;
}
/**
}
/**
@@
-121,6
+127,11
@@
priv_vlan_strip_queue_set(struct priv *priv, uint16_t idx, int on)
DEBUG("set VLAN offloads 0x%x for port %d queue %d",
vlan_offloads, rxq->port_id, idx);
DEBUG("set VLAN offloads 0x%x for port %d queue %d",
vlan_offloads, rxq->port_id, idx);
+ if (!rxq_ctrl->ibv) {
+ /* Update related bits in RX queue. */
+ rxq->vlan_strip = !!on;
+ return;
+ }
mod = (struct ibv_wq_attr){
.attr_mask = IBV_WQ_ATTR_FLAGS,
.flags_mask = IBV_WQ_FLAGS_CVLAN_STRIPPING,
mod = (struct ibv_wq_attr){
.attr_mask = IBV_WQ_ATTR_FLAGS,
.flags_mask = IBV_WQ_FLAGS_CVLAN_STRIPPING,
@@
-154,7
+165,7
@@
mlx5_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on)
struct priv *priv = dev->data->dev_private;
/* Validate hw support */
struct priv *priv = dev->data->dev_private;
/* Validate hw support */
- if (!priv->hw_vlan_strip) {
+ if (!priv->
config.
hw_vlan_strip) {
ERROR("VLAN stripping is not supported");
return;
}
ERROR("VLAN stripping is not supported");
return;
}
@@
-185,9
+196,10
@@
mlx5_vlan_offload_set(struct rte_eth_dev *dev, int mask)
unsigned int i;
if (mask & ETH_VLAN_STRIP_MASK) {
unsigned int i;
if (mask & ETH_VLAN_STRIP_MASK) {
- int hw_vlan_strip = !!dev->data->dev_conf.rxmode.hw_vlan_strip;
+ int hw_vlan_strip = !!(dev->data->dev_conf.rxmode.offloads &
+ DEV_RX_OFFLOAD_VLAN_STRIP);
- if (!priv->hw_vlan_strip) {
+ if (!priv->
config.
hw_vlan_strip) {
ERROR("VLAN stripping is not supported");
return 0;
}
ERROR("VLAN stripping is not supported");
return 0;
}