[dpdk-dev] net/enic: remove assert which causes compile error

Message ID 20161012180935.8366-1-johndale@cisco.com (mailing list archive)
State Accepted, archived
Delegated to: Bruce Richardson
Headers

Commit Message

John Daley (johndale) Oct. 12, 2016, 6:09 p.m. UTC
  Remove an RTE_ASSERT which will not compile if enabled and is not needed.

Fixes: a1f7c7b3b5b2 ("net/enic: extend fdir support for 1300 series adapters")

Signed-off-by: John Daley <johndale@cisco.com>
---
Would have been nice if I caught this yesterday before you applied a1f7c7b3 :(

 drivers/net/enic/enic_clsf.c | 2 --
 1 file changed, 2 deletions(-)
  

Comments

Bruce Richardson Oct. 13, 2016, 1:22 p.m. UTC | #1
On Wed, Oct 12, 2016 at 11:09:35AM -0700, John Daley wrote:
> Remove an RTE_ASSERT which will not compile if enabled and is not needed.
> 
> Fixes: a1f7c7b3b5b2 ("net/enic: extend fdir support for 1300 series adapters")
> 
> Signed-off-by: John Daley <johndale@cisco.com>
> ---
> Would have been nice if I caught this yesterday before you applied a1f7c7b3 :(
> 
Since commit a1f7c7b3 has not been pulled into the dpdk.org mainline, I can still
merge this commit into the origin one that has the bug. Unless you object, I 
shall do so now.

/Bruce
  
Bruce Richardson Oct. 13, 2016, 1:37 p.m. UTC | #2
On Thu, Oct 13, 2016 at 02:22:16PM +0100, Bruce Richardson wrote:
> On Wed, Oct 12, 2016 at 11:09:35AM -0700, John Daley wrote:
> > Remove an RTE_ASSERT which will not compile if enabled and is not needed.
> > 
> > Fixes: a1f7c7b3b5b2 ("net/enic: extend fdir support for 1300 series adapters")
> > 
> > Signed-off-by: John Daley <johndale@cisco.com>
> > ---
> > Would have been nice if I caught this yesterday before you applied a1f7c7b3 :(
> > 
> Since commit a1f7c7b3 has not been pulled into the dpdk.org mainline, I can still
> merge this commit into the origin one that has the bug. Unless you object, I 
> shall do so now.
> 
> /Bruce
Done. Fix merged into original commit

/Bruce
  

Patch

diff --git a/drivers/net/enic/enic_clsf.c b/drivers/net/enic/enic_clsf.c
index c709be9..d2413d7 100644
--- a/drivers/net/enic/enic_clsf.c
+++ b/drivers/net/enic/enic_clsf.c
@@ -142,8 +142,6 @@  copy_fltr_v2(struct filter_v2 *fltr, struct rte_eth_fdir_input *input,
 	struct filter_generic_1 *gp = &fltr->u.generic_1;
 	int i;
 
-	RTE_ASSERT(enic->adv_filters);
-
 	fltr->type = FILTER_DPDK_1;
 	memset(gp, 0, sizeof(*gp));