From 9d7d8513b587d32b8f66b61bb8069cd10235fae0 Mon Sep 17 00:00:00 2001 From: "Chen Jing D(Mark)" Date: Fri, 20 Jun 2014 18:24:40 +0800 Subject: [PATCH] i40e: add permanent mac address into mac list In old firmware versions, the default mac vlan filter setting is not the one that we expected, so we'll try to remove it and add new one to change default setting. After firmware updated, it change default setting to the one that we expected and don't allow to remove the setting. In this case, we should add the perenant mac address into mac list and then return. Signed-off-by: Chen Jing D(Mark) Acked-by: Helin Zhang Acked-by: Cunming Liang Acked-by: Jingjing Wu --- lib/librte_pmd_i40e/i40e_ethdev.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/lib/librte_pmd_i40e/i40e_ethdev.c b/lib/librte_pmd_i40e/i40e_ethdev.c index 7ee6a70c4b..4535cdfa2c 100644 --- a/lib/librte_pmd_i40e/i40e_ethdev.c +++ b/lib/librte_pmd_i40e/i40e_ethdev.c @@ -2277,8 +2277,24 @@ i40e_update_default_filter_setting(struct i40e_vsi *vsi) def_filter.flags = I40E_AQC_MACVLAN_DEL_PERFECT_MATCH | I40E_AQC_MACVLAN_DEL_IGNORE_VLAN; ret = i40e_aq_remove_macvlan(hw, vsi->seid, &def_filter, 1, NULL); - if (ret != I40E_SUCCESS) + if (ret != I40E_SUCCESS) { + struct i40e_mac_filter *f; + PMD_DRV_LOG(WARNING, "Failed to remove default [mac,vlan] config\n"); + + /* Even failed to update default setting, still needs to add the permanent + * mac into mac list. + */ + f = rte_zmalloc("macv_filter", sizeof(*f), 0); + if (f == NULL) { + PMD_DRV_LOG(ERR, "failed to allocate memory\n"); + return I40E_ERR_NO_MEMORY; + } + (void)rte_memcpy(&f->macaddr.addr_bytes, hw->mac.perm_addr, + ETH_ADDR_LEN); + TAILQ_INSERT_TAIL(&vsi->mac_list, f, next); + vsi->mac_num++; return ret; + } return i40e_vsi_add_mac(vsi, (struct ether_addr *)(hw->mac.perm_addr)); }