From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ferruh Yigit <ferruh.yigit@intel.com>
Subject: Re: [RFC 6/9] net/avf: enable ops for MAC VLAN offload
Date: Tue, 21 Nov 2017 16:07:17 -0800
Message-ID: <d3cdd1b3-5c55-12f9-05d1-d98890b7daee@intel.com>
References: <1508488012-82704-1-git-send-email-jingjing.wu@intel.com>
 <1508488012-82704-7-git-send-email-jingjing.wu@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Cc: wenzhuo.lu@intel.com
To: Jingjing Wu <jingjing.wu@intel.com>, dev@dpdk.org
Return-path: <dev-bounces@dpdk.org>
Received: from mga01.intel.com (mga01.intel.com [192.55.52.88])
 by dpdk.org (Postfix) with ESMTP id 3CF88235
 for <dev@dpdk.org>; Wed, 22 Nov 2017 01:07:19 +0100 (CET)
In-Reply-To: <1508488012-82704-7-git-send-email-jingjing.wu@intel.com>
Content-Language: en-US
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>

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.

<...>