lkml.org 
[lkml]   [2022]   [Apr]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 343/475] net: hns3: fix software vlan talbe of vlan 0 inconsistent with hardware
    Date
    From: Guangbin Huang <huangguangbin2@huawei.com>

    commit 7ed258f12ec5ce855f15cdfb5710361dc82fe899 upstream.

    When user delete vlan 0, as driver will not delete vlan 0 for hardware in
    function hclge_set_vlan_filter_hw(), so vlan 0 in software vlan talbe should
    not be deleted.

    Fixes: fe4144d47eef ("net: hns3: sync VLAN filter entries when kill VLAN ID failed")
    Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
    Signed-off-by: Paolo Abeni <pabeni@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
    +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
    @@ -8344,11 +8344,11 @@ int hclge_set_vlan_filter(struct hnae3_h
    }

    if (!ret) {
    - if (is_kill)
    - hclge_rm_vport_vlan_table(vport, vlan_id, false);
    - else
    + if (!is_kill)
    hclge_add_vport_vlan_table(vport, vlan_id,
    writen_to_tbl);
    + else if (is_kill && vlan_id != 0)
    + hclge_rm_vport_vlan_table(vport, vlan_id, false);
    } else if (is_kill) {
    /* when remove hw vlan filter failed, record the vlan id,
    * and try to remove it from hw later, to be consistence

    \
     
     \ /
      Last update: 2022-04-14 17:07    [W:4.018 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site