On 10/20/2017 1:26 AM, Jingjing Wu wrote: > - promiscuous_enable > - promiscuous_disable > - allmulticast_enable > - allmulticast_disable > - mac_addr_add > - mac_addr_remove > - mac_addr_set
+ .vlan_filter_set = avf_dev_vlan_filter_set, + .vlan_offload_set = avf_dev_vlan_offload_set, And does more than what patch title says. <...> > +static void avf_dev_set_default_mac_addr(struct rte_eth_dev *dev, > + struct ether_addr *mac_addr); > +>>>>>>> 50b4111... net/avf: enable ops for MAC VLAN offload This looks like a merge artifact. <...>
