[dpdk-dev] [PATCH] net/i40e: i40e PMD check enhancement

[Wenzhuo Lu]

Change is_i40e_pmd to is_device_supported to make it
more generic.

Signed-off-by: Wenzhuo Lu <wenzhuo.lu at intel.com>
---
 drivers/net/i40e/i40e_ethdev.c | 42 ++++++++++++++++++++----------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index b2dd6d6..caebf57 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -10260,16 +10260,14 @@ static void i40e_set_default_mac_addr(struct rte_eth_dev *dev,
 	i40e_fdir_filter_restore(pf);
 }
 
-static int
-is_i40e_pmd(const char *driver_name)
+static bool
+is_device_supported(struct rte_eth_dev *dev, struct eth_driver *drv)
 {
-	if (!strstr(driver_name, "i40e"))
-		return -ENOTSUP;
+	if (strcmp(dev->driver->pci_drv.driver.name,
+		   drv->pci_drv.driver.name))
+		return false;
 
-	if (strstr(driver_name, "i40e_vf"))
-		return -ENOTSUP;
-
-	return 0;
+	return true;
 }
 
 int
@@ -10282,7 +10280,7 @@ static void i40e_set_default_mac_addr(struct rte_eth_dev *dev,
 
 	dev = &rte_eth_devices[port];
 
-	if (is_i40e_pmd(dev->data->drv_name))
+	if (!is_device_supported(dev, &rte_i40e_pmd))
 		return -ENOTSUP;
 
 	pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
@@ -10311,7 +10309,7 @@ static void i40e_set_default_mac_addr(struct rte_eth_dev *dev,
 
 	dev = &rte_eth_devices[port];
 
-	if (is_i40e_pmd(dev->data->drv_name))
+	if (!is_device_supported(dev, &rte_i40e_pmd))
 		return -ENOTSUP;
 
 	pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
@@ -10415,7 +10413,7 @@ static void i40e_set_default_mac_addr(struct rte_eth_dev *dev,
 
 	dev = &rte_eth_devices[port];
 
-	if (is_i40e_pmd(dev->data->drv_name))
+	if (!is_device_supported(dev, &rte_i40e_pmd))
 		return -ENOTSUP;
 
 	pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
@@ -10673,7 +10671,7 @@ static void i40e_set_default_mac_addr(struct rte_eth_dev *dev,
 
 	dev = &rte_eth_devices[port];
 
-	if (is_i40e_pmd(dev->data->drv_name))
+	if (!is_device_supported(dev, &rte_i40e_pmd))
 		return -ENOTSUP;
 
 	pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
@@ -10715,7 +10713,7 @@ static void i40e_set_default_mac_addr(struct rte_eth_dev *dev,
 
 	dev = &rte_eth_devices[port];
 
-	if (is_i40e_pmd(dev->data->drv_name))
+	if (!is_device_supported(dev, &rte_i40e_pmd))
 		return -ENOTSUP;
 
 	pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
@@ -10756,7 +10754,7 @@ static void i40e_set_default_mac_addr(struct rte_eth_dev *dev,
 
 	dev = &rte_eth_devices[port];
 
-	if (is_i40e_pmd(dev->data->drv_name))
+	if (!is_device_supported(dev, &rte_i40e_pmd))
 		return -ENOTSUP;
 
 	pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
@@ -10802,7 +10800,7 @@ static void i40e_set_default_mac_addr(struct rte_eth_dev *dev,
 
 	dev = &rte_eth_devices[port];
 
-	if (is_i40e_pmd(dev->data->drv_name))
+	if (!is_device_supported(dev, &rte_i40e_pmd))
 		return -ENOTSUP;
 
 	pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
@@ -10839,7 +10837,7 @@ static void i40e_set_default_mac_addr(struct rte_eth_dev *dev,
 
 	dev = &rte_eth_devices[port];
 
-	if (is_i40e_pmd(dev->data->drv_name))
+	if (!is_device_supported(dev, &rte_i40e_pmd))
 		return -ENOTSUP;
 
 	pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
@@ -10882,7 +10880,7 @@ int rte_pmd_i40e_set_vf_vlan_insert(uint8_t port, uint16_t vf_id,
 
 	dev = &rte_eth_devices[port];
 
-	if (is_i40e_pmd(dev->data->drv_name))
+	if (!is_device_supported(dev, &rte_i40e_pmd))
 		return -ENOTSUP;
 
 	pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
@@ -10946,7 +10944,7 @@ int rte_pmd_i40e_set_vf_broadcast(uint8_t port, uint16_t vf_id,
 
 	dev = &rte_eth_devices[port];
 
-	if (is_i40e_pmd(dev->data->drv_name))
+	if (!is_device_supported(dev, &rte_i40e_pmd))
 		return -ENOTSUP;
 
 	pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
@@ -11002,7 +11000,7 @@ int rte_pmd_i40e_set_vf_vlan_tag(uint8_t port, uint16_t vf_id, uint8_t on)
 
 	dev = &rte_eth_devices[port];
 
-	if (is_i40e_pmd(dev->data->drv_name))
+	if (!is_device_supported(dev, &rte_i40e_pmd))
 		return -ENOTSUP;
 
 	pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
@@ -11065,7 +11063,7 @@ int rte_pmd_i40e_set_vf_vlan_filter(uint8_t port, uint16_t vlan_id,
 
 	dev = &rte_eth_devices[port];
 
-	if (is_i40e_pmd(dev->data->drv_name))
+	if (!is_device_supported(dev, &rte_i40e_pmd))
 		return -ENOTSUP;
 
 	if (vlan_id > ETHER_MAX_VLAN_ID) {
@@ -11128,7 +11126,7 @@ int rte_pmd_i40e_set_vf_vlan_filter(uint8_t port, uint16_t vlan_id,
 
 	dev = &rte_eth_devices[port];
 
-	if (is_i40e_pmd(dev->data->drv_name))
+	if (!is_device_supported(dev, &rte_i40e_pmd))
 		return -ENOTSUP;
 
 	pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
@@ -11172,7 +11170,7 @@ int rte_pmd_i40e_set_vf_vlan_filter(uint8_t port, uint16_t vlan_id,
 
 	dev = &rte_eth_devices[port];
 
-	if (is_i40e_pmd(dev->data->drv_name))
+	if (!is_device_supported(dev, &rte_i40e_pmd))
 		return -ENOTSUP;
 
 	pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
-- 
1.9.3