[dpdk-dev] [PATCH] fm10k: fix an error message when adding default VLAN

Shaopeng He shaopeng.he at intel.com
Fri Jun 26 04:37:26 CEST 2015


The default MAC address is directly copied to Device Ethernet
Link address array in the device initialize phase, which
bypasses fm10k MAC address number check mechanism, and will
cause an error message when adding default VLAN. Fix it by
moving default MAC address registration to device
initialize phase.

Signed-off-by: Shaopeng He <shaopeng.he at intel.com>
---
 drivers/net/fm10k/fm10k_ethdev.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c
index 406c350..df32665 100644
--- a/drivers/net/fm10k/fm10k_ethdev.c
+++ b/drivers/net/fm10k/fm10k_ethdev.c
@@ -791,14 +791,10 @@ fm10k_dev_start(struct rte_eth_dev *dev)
 		}
 	}
 
-	if (hw->mac.default_vid && hw->mac.default_vid <= ETHER_MAX_VLAN_ID) {
-		/* Update default vlan */
+	/* Update default vlan */
+	if (hw->mac.default_vid && hw->mac.default_vid <= ETHER_MAX_VLAN_ID)
 		fm10k_vlan_filter_set(dev, hw->mac.default_vid, true);
 
-		/* Add default mac/vlan filter to PF/Switch manager */
-		fm10k_MAC_filter_set(dev, hw->mac.addr, true);
-	}
-
 	return 0;
 }
 
@@ -2144,6 +2140,8 @@ eth_fm10k_dev_init(struct rte_eth_dev *dev)
 
 	fm10k_mbx_unlock(hw);
 
+	/* Add default mac address */
+	fm10k_MAC_filter_set(dev, hw->mac.addr, true);
 
 	return 0;
 }
-- 
1.9.3



More information about the dev mailing list