On 5/6/2016 7:07 AM, Beilei Xing wrote:

This patch adds support for the VLVF to be bypassed when adding or
removing a VFTA entry.  The PF can utilize the default pool while
preserving the VLVF for the VFs use.
Meanwhile, update corresponding VF ops and drivers where corresponding
ops is invoked.

Signed-off-by: Beilei Xing <redacted>
---
 drivers/net/ixgbe/base/ixgbe_82598.c  |  5 ++-
 drivers/net/ixgbe/base/ixgbe_82598.h  |  3 +-
 drivers/net/ixgbe/base/ixgbe_api.c    | 11 ++++--
 drivers/net/ixgbe/base/ixgbe_api.h    |  5 ++-
 drivers/net/ixgbe/base/ixgbe_common.c | 71 +++++++++++++++++++----------------
 drivers/net/ixgbe/base/ixgbe_common.h |  7 ++--
 drivers/net/ixgbe/base/ixgbe_type.h   |  5 ++-
 drivers/net/ixgbe/base/ixgbe_vf.c     |  6 ++-
 drivers/net/ixgbe/base/ixgbe_vf.h     |  3 +-
 drivers/net/ixgbe/ixgbe_ethdev.c      | 11 ++++--
 drivers/net/ixgbe/ixgbe_pf.c          |  2 +-
 11 files changed, 76 insertions(+), 53 deletions(-)

Hi Beilei,

This patch failing to apply to latest dpdk-next-net/rel_16_07

Applying: ixgbe/base: add bypassing VLVF
Using index info to reconstruct a base tree...
M       drivers/net/ixgbe/ixgbe_ethdev.c
M       drivers/net/ixgbe/ixgbe_pf.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/ixgbe/ixgbe_pf.c
Auto-merging drivers/net/ixgbe/ixgbe_ethdev.c
CONFLICT (content): Merge conflict in drivers/net/ixgbe/ixgbe_ethdev.c
Failed to merge in the changes.
Patch failed at 0001 ixgbe/base: add bypassing VLVF