提交 fbd5eb54 编写于 作者: H Harshitha Ramamurthy 提交者: Jeff Kirsher

i40evf: Use an iterator of the same type as the list

When iterating through the linked list of VLAN filters, make the
iterator the same type as that of the linked list.
Signed-off-by: NHarshitha Ramamurthy <harshitha.ramamurthy@intel.com>
Tested-by: NAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
上级 a48350c2
......@@ -1027,6 +1027,7 @@ static void i40evf_up_complete(struct i40evf_adapter *adapter)
void i40evf_down(struct i40evf_adapter *adapter)
{
struct net_device *netdev = adapter->netdev;
struct i40evf_vlan_filter *vlf;
struct i40evf_mac_filter *f;
if (adapter->state <= __I40EVF_DOWN_PENDING)
......@@ -1045,7 +1046,7 @@ void i40evf_down(struct i40evf_adapter *adapter)
f->remove = true;
}
/* remove all VLAN filters */
list_for_each_entry(f, &adapter->vlan_filter_list, list) {
list_for_each_entry(vlf, &adapter->vlan_filter_list, list) {
f->remove = true;
}
......@@ -3067,6 +3068,7 @@ static void i40evf_remove(struct pci_dev *pdev)
{
struct net_device *netdev = pci_get_drvdata(pdev);
struct i40evf_adapter *adapter = netdev_priv(netdev);
struct i40evf_vlan_filter *vlf, *vlftmp;
struct i40evf_mac_filter *f, *ftmp;
struct i40e_hw *hw = &adapter->hw;
int err;
......@@ -3129,9 +3131,10 @@ static void i40evf_remove(struct pci_dev *pdev)
list_del(&f->list);
kfree(f);
}
list_for_each_entry_safe(f, ftmp, &adapter->vlan_filter_list, list) {
list_del(&f->list);
kfree(f);
list_for_each_entry_safe(vlf, vlftmp, &adapter->vlan_filter_list,
list) {
list_del(&vlf->list);
kfree(vlf);
}
spin_unlock_bh(&adapter->mac_vlan_list_lock);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册