Hi, Pablo & Thomas You are correct. This is a merge mistake.
Besides that, there are some comments from Konstantin, I'm reworking on this patchset. The new patchset is coming soon. Thanks for reminder. Jingjing > -----Original Message----- > From: Thomas Monjalon [mailto:thomas.monjalon at 6wind.com] > Sent: Thursday, November 13, 2014 5:50 PM > To: Wu, Jingjing > Cc: dev at dpdk.org; De Lara Guarch, Pablo > Subject: Re: [dpdk-dev] [PATCH v5 05/21] i40e: implement operations to > add/delete flow > director > > Hi Jingjing, > > You didn't reply to Pablo's comment. > Any news of this patchset? Could it be reviewed? > > Thanks > -- > Thomas > > 2014-11-05 21:18, De Lara Guarch, Pablo: > > From: dev [mailto:dev-bounces at dpdk.org] On Behalf Of Jingjing Wu > > > Deal with two operations for flow director > > > - RTE_ETH_FILTER_ADD > > > - RTE_ETH_FILTER_DELETE > > > Encode the flow inputs to programming packet. > > > Sent the packet to filter programming queue and check status > > > on the status report queue. > > > > > > Signed-off-by: Jingjing Wu <jingjing.wu at intel.com> > > > --- > > > lib/librte_pmd_i40e/i40e_ethdev.c | 3 + > > > lib/librte_pmd_i40e/i40e_ethdev.h | 3 + > > > lib/librte_pmd_i40e/i40e_fdir.c | 622 > > > ++++++++++++++++++++++++++++++++++++++ > > > 3 files changed, 628 insertions(+) > > > > > > diff --git a/lib/librte_pmd_i40e/i40e_ethdev.c > > > b/lib/librte_pmd_i40e/i40e_ethdev.c > > > index 8195e8a..fb43efb 100644 > > > --- a/lib/librte_pmd_i40e/i40e_ethdev.c > > > +++ b/lib/librte_pmd_i40e/i40e_ethdev.c > > > @@ -4577,6 +4577,7 @@ i40e_dev_filter_ctrl(struct rte_eth_dev *dev, > > > enum rte_filter_op filter_op, > > > void *arg) > > > { > > > + struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data- > > > >dev_private); > > > int ret = 0; > > > > > > if (dev == NULL) > > > @@ -4585,6 +4586,8 @@ i40e_dev_filter_ctrl(struct rte_eth_dev *dev, > > > switch (filter_type) { > > > case RTE_ETH_FILTER_TUNNEL: > > > ret = i40e_tunnel_filter_handle(dev, filter_op, arg); > > > > Missing break here? > > > > > + case RTE_ETH_FILTER_FDIR: > > > + ret = i40e_fdir_ctrl_func(pf, filter_op, arg); > > > break; > > > default: > > > PMD_DRV_LOG(WARNING, "Filter type (%d) not > > > supported",