[dpdk-dev] i40e: fix compilation error on icc 2015

Message ID 1447150780-240434-1-git-send-email-pablo.de.lara.guarch@intel.com (mailing list archive)
State Accepted, archived
Headers

Commit Message

De Lara Guarch, Pablo Nov. 10, 2015, 10:19 a.m. UTC
  Fix for the following error on icc 2015, due to incorrect type:
drivers/net/i40e/i40e_fdir.c(1376): error #188: enumerated type mixed with another type
        case RTE_ETH_FDIR_FILTER_INPUT_SET_SELECT:
             ^

Fixes: 98f05570 ("i40e: configure input fields for RSS or flow director")

Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
---
 drivers/net/i40e/i40e_fdir.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
  

Comments

Zhang, Helin Nov. 10, 2015, 10:30 a.m. UTC | #1
> -----Original Message-----
> From: De Lara Guarch, Pablo
> Sent: Tuesday, November 10, 2015 6:20 PM
> To: Zhang, Helin
> Cc: dev@dpdk.org; De Lara Guarch, Pablo
> Subject: [PATCH] i40e: fix compilation error on icc 2015
> 
> Fix for the following error on icc 2015, due to incorrect type:
> drivers/net/i40e/i40e_fdir.c(1376): error #188: enumerated type mixed with
> another type
>         case RTE_ETH_FDIR_FILTER_INPUT_SET_SELECT:
>              ^
> 
> Fixes: 98f05570 ("i40e: configure input fields for RSS or flow director")
> 
> Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
Acked-by: Helin Zhang <helin.zhang@intel.com>
  
Thomas Monjalon Nov. 10, 2015, 6:12 p.m. UTC | #2
> > Fix for the following error on icc 2015, due to incorrect type:
> > drivers/net/i40e/i40e_fdir.c(1376): error #188: enumerated type mixed with
> > another type
> >         case RTE_ETH_FDIR_FILTER_INPUT_SET_SELECT:
> >              ^
> > 
> > Fixes: 98f05570 ("i40e: configure input fields for RSS or flow director")
> > 
> > Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
> Acked-by: Helin Zhang <helin.zhang@intel.com>

Applied, thanks
  

Patch

diff --git a/drivers/net/i40e/i40e_fdir.c b/drivers/net/i40e/i40e_fdir.c
index 7b1aa6e..23f8a30 100644
--- a/drivers/net/i40e/i40e_fdir.c
+++ b/drivers/net/i40e/i40e_fdir.c
@@ -1361,7 +1361,7 @@  i40e_fdir_stats_get(struct rte_eth_dev *dev, struct rte_eth_fdir_stats *stat)
 
 static int
 i40e_fdir_filter_set(struct rte_eth_dev *dev,
-		     struct rte_eth_hash_filter_info *info)
+		     struct rte_eth_fdir_filter_info *info)
 {
 	struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
 	struct i40e_hw *hw = I40E_PF_TO_HW(pf);
@@ -1428,7 +1428,7 @@  i40e_fdir_ctrl_func(struct rte_eth_dev *dev,
 		break;
 	case RTE_ETH_FILTER_SET:
 		ret = i40e_fdir_filter_set(dev,
-			(struct rte_eth_hash_filter_info *)arg);
+			(struct rte_eth_fdir_filter_info *)arg);
 		break;
 	case RTE_ETH_FILTER_STATS:
 		i40e_fdir_stats_get(dev, (struct rte_eth_fdir_stats *)arg);