modify&nbsp;some&nbsp;vlan&nbsp;related&nbsp;issues,&nbsp;and&nbsp;provided<br />vlan&nbsp;tpid&nbsp;set&nbsp;ops.<br />
<br />Signed-off-by:&nbsp;Junlong&nbsp;Wang&nbsp;&lt;wang.junlong1@zte.com.cn&gt;
<br />---<br />&nbsp;drivers/net/zxdh/zxdh_ethdev.c&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|&nbsp;10&nbsp;+++++-<br />&nbsp;drivers/net/zxdh/zxdh_ethdev_ops.c&nbsp;|&nbsp;39&nbsp;+++++++++++++++++++-<br />&nbsp;drivers/net/zxdh/zxdh_ethdev_ops.h&nbsp;|&nbsp;&nbsp;1&nbsp;+<br />&nbsp;drivers/net/zxdh/zxdh_msg.c&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|&nbsp;58&nbsp;+++++++++++++++++++++++++++++-<br />&nbsp;drivers/net/zxdh/zxdh_msg.h&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;7&nbsp;+++-<br />&nbsp;drivers/net/zxdh/zxdh_tables.c&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|&nbsp;30&nbsp;++++++++++++----<br />&nbsp;drivers/net/zxdh/zxdh_tables.h&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;|&nbsp;&nbsp;7&nbsp;+++-<br />&nbsp;7&nbsp;files&nbsp;changed,&nbsp;140&nbsp;insertions(+),&nbsp;12&nbsp;deletions(-)<br />
<br />diff&nbsp;--git&nbsp;a/drivers/net/zxdh/zxdh_ethdev.c&nbsp;b/drivers/net/zxdh/zxdh_ethdev.c<br />index&nbsp;74018821d1..9512aff99c&nbsp;100644<br />---&nbsp;a/drivers/net/zxdh/zxdh_ethdev.c<br />+++&nbsp;b/drivers/net/zxdh/zxdh_ethdev.c<br />@@&nbsp;-1429,6&nbsp;+1429,7&nbsp;@@&nbsp;static&nbsp;const&nbsp;struct&nbsp;eth_dev_ops&nbsp;zxdh_eth_dev_ops&nbsp;=&nbsp;{<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;.allmulticast_disable&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;=&nbsp;zxdh_dev_allmulticast_disable,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;.vlan_filter_set&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;=&nbsp;zxdh_dev_vlan_filter_set,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;.vlan_offload_set&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;=&nbsp;zxdh_dev_vlan_offload_set,<br />+&nbsp;&nbsp;&nbsp;&nbsp;.vlan_tpid_set&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;=&nbsp;zxdh_vlan_tpid_set,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;.reta_update&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;=&nbsp;zxdh_dev_rss_reta_update,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;.reta_query&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;=&nbsp;zxdh_dev_rss_reta_query,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;.rss_hash_update&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;=&nbsp;zxdh_rss_hash_update,<br />@@&nbsp;-1907,6&nbsp;+1908,7&nbsp;@@&nbsp;zxdh_np_init(struct&nbsp;rte_eth_dev&nbsp;*eth_dev)<br />&nbsp;static&nbsp;int<br />&nbsp;zxdh_tables_init(struct&nbsp;rte_eth_dev&nbsp;*dev)<br />&nbsp;{<br />+&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;zxdh_hw&nbsp;*hw&nbsp;=&nbsp;dev-&gt;data-&gt;dev_private;<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;int&nbsp;ret&nbsp;=&nbsp;0;<br />&nbsp;
<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ret&nbsp;=&nbsp;zxdh_port_attr_init(dev);<br />@@&nbsp;-1927,12&nbsp;+1929,18&nbsp;@@&nbsp;zxdh_tables_init(struct&nbsp;rte_eth_dev&nbsp;*dev)<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;ret;<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}<br />&nbsp;
<br />-&nbsp;&nbsp;&nbsp;&nbsp;ret&nbsp;=&nbsp;zxdh_vlan_filter_table_init(dev);<br />+&nbsp;&nbsp;&nbsp;&nbsp;ret&nbsp;=&nbsp;zxdh_vlan_filter_table_init(hw,&nbsp;hw-&gt;vport.vport);<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(ret)&nbsp;{<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;PMD_DRV_LOG(ERR,&nbsp;&quot;vlan&nbsp;filter&nbsp;table&nbsp;init&nbsp;failed&quot;);<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;ret;<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}<br />&nbsp;
<br />+&nbsp;&nbsp;&nbsp;&nbsp;ret&nbsp;=&nbsp;zxdh_port_vlan_table_init(hw,&nbsp;hw-&gt;vport.vport);<br />+&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(ret)&nbsp;{<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;PMD_DRV_LOG(ERR,&nbsp;&quot;port&nbsp;vlan&nbsp;table&nbsp;init&nbsp;failed&quot;);<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;ret;<br />+&nbsp;&nbsp;&nbsp;&nbsp;}<br />+<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;ret;<br />&nbsp;}<br />&nbsp;
<br />diff&nbsp;--git&nbsp;a/drivers/net/zxdh/zxdh_ethdev_ops.c&nbsp;b/drivers/net/zxdh/zxdh_ethdev_ops.c<br />index&nbsp;e865d23849..c16271aeaf&nbsp;100644<br />---&nbsp;a/drivers/net/zxdh/zxdh_ethdev_ops.c<br />+++&nbsp;b/drivers/net/zxdh/zxdh_ethdev_ops.c<br />@@&nbsp;-895,7&nbsp;+895,7&nbsp;@@&nbsp;zxdh_dev_vlan_offload_set(struct&nbsp;rte_eth_dev&nbsp;*dev,&nbsp;int&nbsp;mask)<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;-EAGAIN;<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}&nbsp;else&nbsp;{<br />-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;msg.data.vlan_filter_set_msg.enable&nbsp;=&nbsp;true;<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;msg.data.vlan_filter_set_msg.enable&nbsp;=&nbsp;false;<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;zxdh_msg_head_build(hw,&nbsp;ZXDH_VLAN_FILTER_SET,&nbsp;&amp;msg);<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ret&nbsp;=&nbsp;zxdh_vf_send_msg_to_pf(hw-&gt;eth_dev,&nbsp;&amp;msg,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;sizeof(struct&nbsp;zxdh_msg_info),&nbsp;NULL,&nbsp;0);<br />@@&nbsp;-1004,6&nbsp;+1004,43&nbsp;@@&nbsp;zxdh_dev_vlan_offload_set(struct&nbsp;rte_eth_dev&nbsp;*dev,&nbsp;int&nbsp;mask)<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;ret;<br />&nbsp;}<br />&nbsp;
<br />+int<br />+zxdh_vlan_tpid_set(struct&nbsp;rte_eth_dev&nbsp;*dev,&nbsp;enum&nbsp;rte_vlan_type&nbsp;vlan_type,&nbsp;uint16_t&nbsp;tpid)<br />+{<br />+&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;zxdh_hw&nbsp;*hw&nbsp;=&nbsp;dev-&gt;data-&gt;dev_private;<br />+&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;zxdh_port_vlan_table&nbsp;port_vlan_table&nbsp;=&nbsp;{0};<br />+&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;zxdh_msg_info&nbsp;msg&nbsp;=&nbsp;{0};<br />+&nbsp;&nbsp;&nbsp;&nbsp;int&nbsp;ret&nbsp;=&nbsp;0;<br />+<br />+&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(vlan_type&nbsp;!=&nbsp;RTE_ETH_VLAN_TYPE_OUTER)&nbsp;{<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;PMD_DRV_LOG(ERR,&nbsp;&quot;unsupported&nbsp;rte&nbsp;vlan&nbsp;type!&quot;);<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;-1;<br />+&nbsp;&nbsp;&nbsp;&nbsp;}<br />+<br />+&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(hw-&gt;is_pf)&nbsp;{<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ret&nbsp;=&nbsp;zxdh_get_port_vlan_attr(hw,&nbsp;hw-&gt;vport.vport,&nbsp;&amp;port_vlan_table);<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(ret&nbsp;!=&nbsp;0)<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;PMD_DRV_LOG(ERR,&nbsp;&quot;get&nbsp;port&nbsp;vlan&nbsp;attr&nbsp;table&nbsp;failed&quot;);<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;port_vlan_table.hit_flag&nbsp;=&nbsp;1;<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;port_vlan_table.business_vlan_tpid&nbsp;=&nbsp;tpid;<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ret&nbsp;=&nbsp;zxdh_set_port_vlan_attr(hw,&nbsp;hw-&gt;vport.vport,&nbsp;&amp;port_vlan_table);<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(ret&nbsp;!=&nbsp;0)<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;PMD_DRV_LOG(ERR,&nbsp;&quot;set&nbsp;port&nbsp;vlan&nbsp;tpid&nbsp;%d&nbsp;attr&nbsp;table&nbsp;failed&quot;,&nbsp;tpid);<br />+&nbsp;&nbsp;&nbsp;&nbsp;}&nbsp;else&nbsp;{<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;zxdh_msg_head_build(hw,&nbsp;ZXDH_VLAN_SET_TPID,&nbsp;&amp;msg);<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;msg.data.zxdh_vlan_tpid.tpid&nbsp;=&nbsp;tpid;<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ret&nbsp;=&nbsp;zxdh_vf_send_msg_to_pf(dev,&nbsp;&amp;msg,<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;sizeof(struct&nbsp;zxdh_msg_info),&nbsp;NULL,&nbsp;0);<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(ret)&nbsp;{<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;PMD_DRV_LOG(ERR,&nbsp;&quot;port&nbsp;%d&nbsp;vlan&nbsp;tpid&nbsp;%d&nbsp;set&nbsp;failed&quot;,<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;hw-&gt;vfid,&nbsp;tpid);<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;-1;<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}<br />+&nbsp;&nbsp;&nbsp;&nbsp;}<br />+<br />+&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;0;<br />+}<br />+<br />&nbsp;int<br />&nbsp;zxdh_dev_rss_reta_update(struct&nbsp;rte_eth_dev&nbsp;*dev,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;rte_eth_rss_reta_entry64&nbsp;*reta_conf,<br />diff&nbsp;--git&nbsp;a/drivers/net/zxdh/zxdh_ethdev_ops.h&nbsp;b/drivers/net/zxdh/zxdh_ethdev_ops.h<br />index&nbsp;97a1eb4532..6015b3de59&nbsp;100644<br />---&nbsp;a/drivers/net/zxdh/zxdh_ethdev_ops.h<br />+++&nbsp;b/drivers/net/zxdh/zxdh_ethdev_ops.h<br />@@&nbsp;-120,6&nbsp;+120,7&nbsp;@@&nbsp;int&nbsp;zxdh_dev_allmulticast_enable(struct&nbsp;rte_eth_dev&nbsp;*dev);<br />&nbsp;int&nbsp;zxdh_dev_allmulticast_disable(struct&nbsp;rte_eth_dev&nbsp;*dev);<br />&nbsp;int&nbsp;zxdh_dev_vlan_filter_set(struct&nbsp;rte_eth_dev&nbsp;*dev,&nbsp;uint16_t&nbsp;vlan_id,&nbsp;int&nbsp;on);<br />&nbsp;int&nbsp;zxdh_dev_vlan_offload_set(struct&nbsp;rte_eth_dev&nbsp;*dev,&nbsp;int&nbsp;mask);<br />+int&nbsp;zxdh_vlan_tpid_set(struct&nbsp;rte_eth_dev&nbsp;*dev,&nbsp;enum&nbsp;rte_vlan_type&nbsp;vlan_type,&nbsp;uint16_t&nbsp;tpid);<br />&nbsp;int&nbsp;zxdh_dev_rss_reta_update(struct&nbsp;rte_eth_dev&nbsp;*dev,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;rte_eth_rss_reta_entry64&nbsp;*reta_conf,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;uint16_t&nbsp;reta_size);<br />diff&nbsp;--git&nbsp;a/drivers/net/zxdh/zxdh_msg.c&nbsp;b/drivers/net/zxdh/zxdh_msg.c<br />index&nbsp;49291cfbaf..be4f115380&nbsp;100644<br />---&nbsp;a/drivers/net/zxdh/zxdh_msg.c<br />+++&nbsp;b/drivers/net/zxdh/zxdh_msg.c<br />@@&nbsp;-1233,6&nbsp;+1233,24&nbsp;@@&nbsp;zxdh_vf_promisc_uninit(struct&nbsp;zxdh_hw&nbsp;*hw,&nbsp;union&nbsp;zxdh_virport_num&nbsp;vport)<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;ret;<br />&nbsp;}<br />&nbsp;
<br />+static&nbsp;int<br />+zxdh_vf_vlan_table_init(struct&nbsp;zxdh_hw&nbsp;*hw,&nbsp;uint16_t&nbsp;vport)<br />+{<br />+&nbsp;&nbsp;&nbsp;&nbsp;int&nbsp;ret&nbsp;=&nbsp;0;<br />+&nbsp;&nbsp;&nbsp;&nbsp;ret&nbsp;=&nbsp;zxdh_vlan_filter_table_init(hw,&nbsp;vport);<br />+&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(ret)&nbsp;{<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;PMD_DRV_LOG(ERR,&nbsp;&quot;vf&nbsp;vlan&nbsp;filter&nbsp;table&nbsp;init&nbsp;failed,&nbsp;code:%d&quot;,&nbsp;ret);<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;-1;<br />+&nbsp;&nbsp;&nbsp;&nbsp;}<br />+<br />+&nbsp;&nbsp;&nbsp;&nbsp;ret&nbsp;=&nbsp;zxdh_port_vlan_table_init(hw,&nbsp;vport);<br />+&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(ret)&nbsp;{<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;PMD_DRV_LOG(ERR,&nbsp;&quot;vf&nbsp;port&nbsp;vlan&nbsp;table&nbsp;init&nbsp;failed,&nbsp;code:%d&quot;,&nbsp;ret);<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;-1;<br />+&nbsp;&nbsp;&nbsp;&nbsp;}<br />+&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;ret;<br />+}<br />+<br />&nbsp;static&nbsp;int<br />&nbsp;zxdh_vf_port_init(struct&nbsp;zxdh_hw&nbsp;*pf_hw,&nbsp;uint16_t&nbsp;vport,&nbsp;void&nbsp;*cfg_data,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;void&nbsp;*res_info,&nbsp;uint16_t&nbsp;*res_len)<br />@@&nbsp;-1254,7&nbsp;+1272,7&nbsp;@@&nbsp;zxdh_vf_port_init(struct&nbsp;zxdh_hw&nbsp;*pf_hw,&nbsp;uint16_t&nbsp;vport,&nbsp;void&nbsp;*cfg_data,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;port_attr.port_base_qid&nbsp;=&nbsp;vf_init_msg-&gt;base_qid;<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;uint16_t&nbsp;vfid&nbsp;=&nbsp;zxdh_vport_to_vfid(port);<br />&nbsp;
<br />-&nbsp;&nbsp;&nbsp;&nbsp;ret&nbsp;=&nbsp;zxdh_set_port_attr(pf_hw,&nbsp;vfid,&nbsp;&amp;port_attr);<br />+&nbsp;&nbsp;&nbsp;&nbsp;ret&nbsp;=&nbsp;zxdh_set_port_attr(pf_hw,&nbsp;vport,&nbsp;&amp;port_attr);<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(ret)&nbsp;{<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;PMD_DRV_LOG(ERR,&nbsp;&quot;set&nbsp;vport&nbsp;attr&nbsp;failed,&nbsp;code:%d&quot;,&nbsp;ret);<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;goto&nbsp;proc_end;<br />@@&nbsp;-1265,6&nbsp;+1283,13&nbsp;@@&nbsp;zxdh_vf_port_init(struct&nbsp;zxdh_hw&nbsp;*pf_hw,&nbsp;uint16_t&nbsp;vport,&nbsp;void&nbsp;*cfg_data,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;PMD_DRV_LOG(ERR,&nbsp;&quot;vf_promisc_table_init&nbsp;failed,&nbsp;code:%d&quot;,&nbsp;ret);<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;goto&nbsp;proc_end;<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}<br />+<br />+&nbsp;&nbsp;&nbsp;&nbsp;ret&nbsp;=&nbsp;zxdh_vf_vlan_table_init(pf_hw,&nbsp;vport);<br />+&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(ret)&nbsp;{<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;PMD_DRV_LOG(ERR,&nbsp;&quot;vf&nbsp;vlan&nbsp;table&nbsp;init&nbsp;failed,&nbsp;code:%d&quot;,&nbsp;ret);<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;goto&nbsp;proc_end;<br />+&nbsp;&nbsp;&nbsp;&nbsp;}<br />+<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ZXDH_SET(msg_reply_body,&nbsp;res_info,&nbsp;flag,&nbsp;ZXDH_REPS_SUCC);<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;*res_len&nbsp;=&nbsp;sizeof(uint8_t);<br />&nbsp;
<br />@@&nbsp;-2131,6&nbsp;+2156,36&nbsp;@@&nbsp;zxdh_vf_mtr_hw_profile_cfg(struct&nbsp;zxdh_hw&nbsp;*pf_hw&nbsp;__rte_unused,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;0;<br />&nbsp;}<br />&nbsp;
<br />+static&nbsp;int<br />+zxdh_vf_vlan_tpid_set(struct&nbsp;zxdh_hw&nbsp;*pf_hw,&nbsp;uint16_t&nbsp;vport,&nbsp;void&nbsp;*cfg_data,<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;void&nbsp;*res_info,&nbsp;uint16_t&nbsp;*res_len)<br />+{<br />+&nbsp;&nbsp;&nbsp;&nbsp;union&nbsp;zxdh_virport_num&nbsp;port&nbsp;=&nbsp;{.vport&nbsp;=&nbsp;vport};<br />+&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;zxdh_vlan_tpid&nbsp;*vlan_tpid&nbsp;=&nbsp;(struct&nbsp;zxdh_vlan_tpid&nbsp;*)cfg_data;<br />+&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;zxdh_port_vlan_table&nbsp;port_vlan_table&nbsp;=&nbsp;{0};<br />+&nbsp;&nbsp;&nbsp;&nbsp;int&nbsp;ret&nbsp;=&nbsp;0;<br />+<br />+&nbsp;&nbsp;&nbsp;&nbsp;RTE_ASSERT(!cfg_data&nbsp;||&nbsp;!pf_hw&nbsp;||&nbsp;!res_info&nbsp;||&nbsp;!res_len);<br />+<br />+&nbsp;&nbsp;&nbsp;&nbsp;ret&nbsp;=&nbsp;zxdh_get_port_vlan_attr(pf_hw,&nbsp;vport,&nbsp;&amp;port_vlan_table);<br />+&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(ret)&nbsp;{<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;PMD_DRV_LOG(ERR,&nbsp;&quot;get&nbsp;port&nbsp;vlan&nbsp;attr&nbsp;failed,&nbsp;code:%d&quot;,&nbsp;ret);<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;goto&nbsp;proc_end;<br />+&nbsp;&nbsp;&nbsp;&nbsp;}<br />+&nbsp;&nbsp;&nbsp;&nbsp;port_vlan_table.hit_flag&nbsp;=&nbsp;1;<br />+&nbsp;&nbsp;&nbsp;&nbsp;port_vlan_table.business_vlan_tpid&nbsp;=&nbsp;vlan_tpid-&gt;tpid;<br />+&nbsp;&nbsp;&nbsp;&nbsp;ret&nbsp;=&nbsp;zxdh_set_port_vlan_attr(pf_hw,&nbsp;vport,&nbsp;&amp;port_vlan_table);<br />+&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(ret)&nbsp;{<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;PMD_DRV_LOG(ERR,&nbsp;&quot;set&nbsp;port&nbsp;vlan&nbsp;attr&nbsp;failed,&nbsp;code:%d&quot;,&nbsp;ret);<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;goto&nbsp;proc_end;<br />+&nbsp;&nbsp;&nbsp;&nbsp;}<br />+<br />+proc_end:<br />+&nbsp;&nbsp;&nbsp;&nbsp;*res_len&nbsp;=&nbsp;sizeof(uint8_t);<br />+&nbsp;&nbsp;&nbsp;&nbsp;ZXDH_SET(msg_reply_body,&nbsp;res_info,&nbsp;flag,&nbsp;ZXDH_REPS_FAIL);<br />+&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;ret;<br />+}<br />+<br />&nbsp;static&nbsp;const&nbsp;zxdh_msg_process_callback&nbsp;zxdh_proc_cb[]&nbsp;=&nbsp;{<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ZXDH_NULL]&nbsp;=&nbsp;NULL,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ZXDH_VF_PORT_INIT]&nbsp;=&nbsp;zxdh_vf_port_init,<br />@@&nbsp;-2142,6&nbsp;+2197,7&nbsp;@@&nbsp;static&nbsp;const&nbsp;zxdh_msg_process_callback&nbsp;zxdh_proc_cb[]&nbsp;=&nbsp;{<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ZXDH_VLAN_FILTER_ADD]&nbsp;=&nbsp;zxdh_vf_vlan_filter_table_add,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ZXDH_VLAN_FILTER_DEL]&nbsp;=&nbsp;zxdh_vf_vlan_filter_table_del,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ZXDH_VLAN_OFFLOAD]&nbsp;=&nbsp;zxdh_vf_set_vlan_offload,<br />+&nbsp;&nbsp;&nbsp;&nbsp;[ZXDH_VLAN_SET_TPID]&nbsp;=&nbsp;zxdh_vf_vlan_tpid_set,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ZXDH_RSS_ENABLE]&nbsp;=&nbsp;zxdh_vf_rss_enable,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ZXDH_RSS_RETA_GET]&nbsp;=&nbsp;zxdh_vf_rss_table_get,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[ZXDH_RSS_RETA_SET]&nbsp;=&nbsp;zxdh_vf_rss_table_set,<br />diff&nbsp;--git&nbsp;a/drivers/net/zxdh/zxdh_msg.h&nbsp;b/drivers/net/zxdh/zxdh_msg.h<br />index&nbsp;7dad6f7335..b62ace7219&nbsp;100644<br />---&nbsp;a/drivers/net/zxdh/zxdh_msg.h<br />+++&nbsp;b/drivers/net/zxdh/zxdh_msg.h<br />@@&nbsp;-229,7&nbsp;+229,7&nbsp;@@&nbsp;enum&nbsp;zxdh_msg_type&nbsp;{<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ZXDH_VLAN_FILTER_ADD&nbsp;=&nbsp;18,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ZXDH_VLAN_FILTER_DEL&nbsp;=&nbsp;19,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ZXDH_VLAN_OFFLOAD&nbsp;=&nbsp;21,<br />-<br />+&nbsp;&nbsp;&nbsp;&nbsp;ZXDH_VLAN_SET_TPID&nbsp;=&nbsp;23,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ZXDH_PORT_ATTRS_SET&nbsp;=&nbsp;25,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ZXDH_PORT_PROMISC_SET&nbsp;=&nbsp;26,<br />&nbsp;
<br />@@&nbsp;-535,6&nbsp;+535,10&nbsp;@@&nbsp;struct&nbsp;zxdh_plcr_profile_free&nbsp;{<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;uint16_t&nbsp;profile_id;<br />&nbsp;};<br />&nbsp;
<br />+struct&nbsp;zxdh_vlan_tpid&nbsp;{<br />+&nbsp;&nbsp;&nbsp;&nbsp;uint16_t&nbsp;tpid;<br />+};<br />+<br />&nbsp;struct&nbsp;zxdh_msg_info&nbsp;{<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;union&nbsp;{<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;uint8_t&nbsp;head_len[ZXDH_MSG_HEAD_LEN];<br />@@&nbsp;-551,6&nbsp;+555,7&nbsp;@@&nbsp;struct&nbsp;zxdh_msg_info&nbsp;{<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;zxdh_vlan_filter&nbsp;vlan_filter_msg;<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;zxdh_vlan_filter_set&nbsp;vlan_filter_set_msg;<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;zxdh_vlan_offload&nbsp;vlan_offload_msg;<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;zxdh_vlan_tpid&nbsp;zxdh_vlan_tpid;<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;zxdh_rss_reta&nbsp;rss_reta;<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;zxdh_rss_enable&nbsp;rss_enable;<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;zxdh_rss_hf&nbsp;rss_hf;<br />diff&nbsp;--git&nbsp;a/drivers/net/zxdh/zxdh_tables.c&nbsp;b/drivers/net/zxdh/zxdh_tables.c<br />index&nbsp;26d9b90382..57a291e92a&nbsp;100644<br />---&nbsp;a/drivers/net/zxdh/zxdh_tables.c<br />+++&nbsp;b/drivers/net/zxdh/zxdh_tables.c<br />@@&nbsp;-700,10&nbsp;+700,11&nbsp;@@&nbsp;zxdh_dev_multicast_table_set(struct&nbsp;zxdh_hw&nbsp;*hw,&nbsp;uint16_t&nbsp;vport,&nbsp;bool&nbsp;enable)<br />&nbsp;}<br />&nbsp;
<br />&nbsp;int<br />-zxdh_vlan_filter_table_init(struct&nbsp;rte_eth_dev&nbsp;*dev)<br />+zxdh_vlan_filter_table_init(struct&nbsp;zxdh_hw&nbsp;*hw,&nbsp;uint16_t&nbsp;vport)<br />&nbsp;{<br />-&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;zxdh_hw&nbsp;*hw&nbsp;=&nbsp;dev-&gt;data-&gt;dev_private;<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;zxdh_dtb_shared_data&nbsp;*dtb_data&nbsp;=&nbsp;&amp;hw-&gt;dev_sd-&gt;dtb_sd;<br />+&nbsp;&nbsp;&nbsp;&nbsp;union&nbsp;zxdh_virport_num&nbsp;vport_num&nbsp;=&nbsp;(union&nbsp;zxdh_virport_num)vport;<br />+&nbsp;&nbsp;&nbsp;&nbsp;uint16_t&nbsp;vfid&nbsp;=&nbsp;zxdh_vport_to_vfid(vport_num);<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;zxdh_vlan_filter_table&nbsp;vlan_table&nbsp;=&nbsp;{0};<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;int16_t&nbsp;ret&nbsp;=&nbsp;0;<br />&nbsp;
<br />@@&nbsp;-718,7&nbsp;+719,7&nbsp;@@&nbsp;zxdh_vlan_filter_table_init(struct&nbsp;rte_eth_dev&nbsp;*dev)<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}&nbsp;else&nbsp;{<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;vlan_table.vlans[0]&nbsp;=&nbsp;0;<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}<br />-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;uint32_t&nbsp;index&nbsp;=&nbsp;(vlan_group&nbsp;&lt;&lt;&nbsp;11)&nbsp;|&nbsp;hw-&gt;vport.vfid;<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;uint32_t&nbsp;index&nbsp;=&nbsp;(vlan_group&nbsp;&lt;&lt;&nbsp;11)&nbsp;|&nbsp;vfid;<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ZXDH_DTB_ERAM_ENTRY_INFO_T&nbsp;entry_data&nbsp;=&nbsp;{<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;.index&nbsp;=&nbsp;index,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;.p_data&nbsp;=&nbsp;(uint32_t&nbsp;*)&amp;vlan_table<br />@@&nbsp;-730,7&nbsp;+731,7&nbsp;@@&nbsp;zxdh_vlan_filter_table_init(struct&nbsp;rte_eth_dev&nbsp;*dev)<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(ret&nbsp;!=&nbsp;0)&nbsp;{<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;PMD_DRV_LOG(ERR,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&quot;[vfid:%d],&nbsp;vlan_group:%d,&nbsp;init&nbsp;vlan&nbsp;filter&nbsp;table&nbsp;failed&quot;,<br />-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;hw-&gt;vport.vfid,&nbsp;vlan_group);<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;vfid,&nbsp;vlan_group);<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;ret&nbsp;=&nbsp;-1;<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;}<br />@@&nbsp;-750,7&nbsp;+751,7&nbsp;@@&nbsp;zxdh_vlan_filter_table_set(struct&nbsp;zxdh_hw&nbsp;*hw,&nbsp;uint16_t&nbsp;vport,&nbsp;uint16_t&nbsp;vlan_id,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;memset(&amp;vlan_table,&nbsp;0,&nbsp;sizeof(struct&nbsp;zxdh_vlan_filter_table));<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;int&nbsp;table_num&nbsp;=&nbsp;vlan_id&nbsp;/&nbsp;ZXDH_VLAN_FILTER_VLANID_STEP;<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;uint32_t&nbsp;index&nbsp;=&nbsp;(table_num&nbsp;&lt;&lt;&nbsp;11)&nbsp;|&nbsp;vfid;<br />-&nbsp;&nbsp;&nbsp;&nbsp;uint16_t&nbsp;group&nbsp;=&nbsp;(vlan_id&nbsp;-&nbsp;table_num&nbsp;*&nbsp;ZXDH_VLAN_FILTER_VLANID_STEP)&nbsp;/&nbsp;8&nbsp;+&nbsp;1;<br />+&nbsp;&nbsp;&nbsp;&nbsp;uint16_t&nbsp;group&nbsp;=&nbsp;(vlan_id&nbsp;%&nbsp;ZXDH_VLAN_FILTER_VLANID_STEP)&nbsp;/&nbsp;8&nbsp;+&nbsp;1;<br />&nbsp;
<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;uint8_t&nbsp;val&nbsp;=&nbsp;sizeof(struct&nbsp;zxdh_vlan_filter_table)&nbsp;/&nbsp;sizeof(uint32_t);<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;uint8_t&nbsp;vlan_tbl_index&nbsp;=&nbsp;group&nbsp;/&nbsp;val;<br />@@&nbsp;-951,7&nbsp;+952,7&nbsp;@@&nbsp;zxdh_vlan_relate_vport(struct&nbsp;rte_eth_dev&nbsp;*dev,&nbsp;uint16_t&nbsp;vport,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;0;<br />&nbsp;}<br />&nbsp;
<br />-static&nbsp;int<br />+int<br />&nbsp;zxdh_set_port_vlan_attr(struct&nbsp;zxdh_hw&nbsp;*hw,&nbsp;uint16_t&nbsp;vport,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;zxdh_port_vlan_table&nbsp;*port_vlan)<br />&nbsp;{<br />@@&nbsp;-974,7&nbsp;+975,7&nbsp;@@&nbsp;zxdh_set_port_vlan_attr(struct&nbsp;zxdh_hw&nbsp;*hw,&nbsp;uint16_t&nbsp;vport,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;ret;<br />&nbsp;}<br />&nbsp;
<br />-static&nbsp;int<br />+int<br />&nbsp;zxdh_get_port_vlan_attr(struct&nbsp;zxdh_hw&nbsp;*hw,&nbsp;uint16_t&nbsp;vport,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;zxdh_port_vlan_table&nbsp;*port_vlan)<br />&nbsp;{<br />@@&nbsp;-1046,3&nbsp;+1047,18&nbsp;@@&nbsp;int&nbsp;zxdh_set_vlan_offload(struct&nbsp;zxdh_hw&nbsp;*hw,&nbsp;uint16_t&nbsp;vport,&nbsp;uint8_t&nbsp;type,&nbsp;uint<br />&nbsp;{<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;set_vlan_config(hw,&nbsp;vport,&nbsp;type,&nbsp;enable);<br />&nbsp;}<br />+<br />+int&nbsp;zxdh_port_vlan_table_init(struct&nbsp;zxdh_hw&nbsp;*hw,&nbsp;uint16_t&nbsp;vport)<br />+{<br />+&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;zxdh_port_vlan_table&nbsp;port_vlan&nbsp;=&nbsp;{0};<br />+&nbsp;&nbsp;&nbsp;&nbsp;int&nbsp;ret&nbsp;=&nbsp;0;<br />+<br />+&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(!hw-&gt;is_pf)<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;0;<br />+<br />+&nbsp;&nbsp;&nbsp;&nbsp;ret&nbsp;=&nbsp;zxdh_set_port_vlan_attr(hw,&nbsp;vport,&nbsp;&amp;port_vlan);<br />+&nbsp;&nbsp;&nbsp;&nbsp;if&nbsp;(ret)<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;PMD_DRV_LOG(ERR,&nbsp;&quot;port&nbsp;vlan&nbsp;table&nbsp;init&nbsp;failed&quot;);<br />+<br />+&nbsp;&nbsp;&nbsp;&nbsp;return&nbsp;ret;<br />+}<br />diff&nbsp;--git&nbsp;a/drivers/net/zxdh/zxdh_tables.h&nbsp;b/drivers/net/zxdh/zxdh_tables.h<br />index&nbsp;cb34e38be8..3280ff1f89&nbsp;100644<br />---&nbsp;a/drivers/net/zxdh/zxdh_tables.h<br />+++&nbsp;b/drivers/net/zxdh/zxdh_tables.h<br />@@&nbsp;-362,7&nbsp;+362,7&nbsp;@@&nbsp;int&nbsp;zxdh_promisc_table_init(struct&nbsp;rte_eth_dev&nbsp;*dev);<br />&nbsp;int&nbsp;zxdh_promisc_table_uninit(struct&nbsp;rte_eth_dev&nbsp;*dev);<br />&nbsp;int&nbsp;zxdh_dev_unicast_table_set(struct&nbsp;zxdh_hw&nbsp;*hw,&nbsp;uint16_t&nbsp;vport,&nbsp;bool&nbsp;enable);<br />&nbsp;int&nbsp;zxdh_dev_multicast_table_set(struct&nbsp;zxdh_hw&nbsp;*hw,&nbsp;uint16_t&nbsp;vport,&nbsp;bool&nbsp;enable);<br />-int&nbsp;zxdh_vlan_filter_table_init(struct&nbsp;rte_eth_dev&nbsp;*dev);<br />+int&nbsp;zxdh_vlan_filter_table_init(struct&nbsp;zxdh_hw&nbsp;*hw,&nbsp;uint16_t&nbsp;vport);<br />&nbsp;int&nbsp;zxdh_vlan_filter_table_set(struct&nbsp;zxdh_hw&nbsp;*hw,&nbsp;uint16_t&nbsp;vport,<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;uint16_t&nbsp;vlan_id,&nbsp;uint8_t&nbsp;enable);<br />&nbsp;int&nbsp;zxdh_rss_table_set(struct&nbsp;zxdh_hw&nbsp;*hw,&nbsp;uint16_t&nbsp;vport,&nbsp;struct&nbsp;zxdh_rss_reta&nbsp;*rss_reta);<br />@@&nbsp;-372,5&nbsp;+372,10&nbsp;@@&nbsp;int&nbsp;zxdh_set_panel_attr(struct&nbsp;rte_eth_dev&nbsp;*dev,&nbsp;struct&nbsp;zxdh_panel_table&nbsp;*panel_<br />&nbsp;int&nbsp;zxdh_dev_broadcast_set(struct&nbsp;zxdh_hw&nbsp;*hw,&nbsp;uint16_t&nbsp;vport,&nbsp;bool&nbsp;enable);<br />&nbsp;int&nbsp;zxdh_set_vlan_filter(struct&nbsp;zxdh_hw&nbsp;*hw,&nbsp;uint16_t&nbsp;vport,&nbsp;uint8_t&nbsp;enable);<br />&nbsp;int&nbsp;zxdh_set_vlan_offload(struct&nbsp;zxdh_hw&nbsp;*hw,&nbsp;uint16_t&nbsp;vport,&nbsp;uint8_t&nbsp;type,&nbsp;uint8_t&nbsp;enable);<br />+int&nbsp;zxdh_set_port_vlan_attr(struct&nbsp;zxdh_hw&nbsp;*hw,&nbsp;uint16_t&nbsp;vport,<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;zxdh_port_vlan_table&nbsp;*port_vlan);<br />+int&nbsp;zxdh_get_port_vlan_attr(struct&nbsp;zxdh_hw&nbsp;*hw,&nbsp;uint16_t&nbsp;vport,<br />+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;struct&nbsp;zxdh_port_vlan_table&nbsp;*port_vlan);<br />+int&nbsp;zxdh_port_vlan_table_init(struct&nbsp;zxdh_hw&nbsp;*hw,&nbsp;uint16_t&nbsp;vport);<br />&nbsp;
<br />&nbsp;#endif&nbsp;/*&nbsp;ZXDH_TABLES_H&nbsp;*/<br />--&nbsp;
<br />2.27.0<br />