d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/dpaa2: change VLAN filter rule to be called on config

Browse Source 
Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>
This commit is contained in:
Hemant Agrawal 2018-01-15 17:08:04 +05:30 committed by Ferruh Yigit
parent d2ef05d5c1
commit c172f85ef2
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/net/dpaa2/dpaa2_ethdev.c
View File

@ -147,6 +147,12 @@ dpaa2_vlan_offload_set(struct rte_eth_dev *dev, int mask)
PMD_INIT_FUNC_TRACE(); PMD_INIT_FUNC_TRACE();
if (mask & ETH_VLAN_FILTER_MASK) { if (mask & ETH_VLAN_FILTER_MASK) {
/* VLAN Filter not avaialble */
if (!priv->max_vlan_filters) {
RTE_LOG(INFO, PMD, "VLAN filter not available\n");
goto next_mask;
}
if (dev->data->dev_conf.rxmode.hw_vlan_filter) if (dev->data->dev_conf.rxmode.hw_vlan_filter)
ret = dpni_enable_vlan_filter(dpni, CMD_PRI_LOW, ret = dpni_enable_vlan_filter(dpni, CMD_PRI_LOW,
priv->token, true); priv->token, true);
@ -157,7 +163,7 @@ dpaa2_vlan_offload_set(struct rte_eth_dev *dev, int mask)
RTE_LOG(ERR, PMD, "Unable to set vlan filter = %d\n", RTE_LOG(ERR, PMD, "Unable to set vlan filter = %d\n",
ret); ret);
} }
next_mask:
if (mask & ETH_VLAN_EXTEND_MASK) { if (mask & ETH_VLAN_EXTEND_MASK) {
if (dev->data->dev_conf.rxmode.hw_vlan_extend) if (dev->data->dev_conf.rxmode.hw_vlan_extend)
RTE_LOG(INFO, PMD, RTE_LOG(INFO, PMD,
@ -374,6 +380,9 @@ dpaa2_eth_dev_configure(struct rte_eth_dev *dev)
return ret; return ret;
} }
if (eth_conf->rxmode.hw_vlan_filter)
dpaa2_vlan_offload_set(dev, ETH_VLAN_FILTER_MASK);
/* update the current status */ /* update the current status */
dpaa2_dev_link_update(dev, 0); dpaa2_dev_link_update(dev, 0);
@ -764,16 +773,6 @@ dpaa2_dev_start(struct rte_eth_dev *dev)
"code = %d\n", ret); "code = %d\n", ret);
return ret; return ret;
} }
/* VLAN Offload Settings */
if (priv->max_vlan_filters) {
ret = dpaa2_vlan_offload_set(dev, ETH_VLAN_FILTER_MASK);
if (ret) {
PMD_INIT_LOG(ERR, "Error to dpaa2_vlan_offload_set:"
"code = %d\n", ret);
return ret;
}
}
/* if the interrupts were configured on this devices*/ /* if the interrupts were configured on this devices*/
if (intr_handle && (intr_handle->fd) && if (intr_handle && (intr_handle->fd) &&