lkml.org 
[lkml]   [2019]   [Feb]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.20 220/352] net: hns3: dont restore rules when flow director is disabled
    Date
    4.20-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ Upstream commit 8edc2285b7285c5fbffe438dc8113260d3e76656 ]

    When user disables flow director, all the rules will be disabled. But
    when reset happens, it will restore all the rules again. It's not
    reasonable. This patch fixes it by add flow director status check before
    restore fules.

    Fixes: 6871af29b3ab ("net: hns3: Add reset handle for flow director")
    Fixes: c17852a8932f ("net: hns3: Add support for enable/disable flow director")
    Signed-off-by: Jian Shen <shenjian15@huawei.com>
    Signed-off-by: Peng Li <lipeng321@huawei.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 4 ++++
    1 file changed, 4 insertions(+)

    diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
    index ffdd96020860..a7895aefe291 100644
    --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
    +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
    @@ -4339,6 +4339,10 @@ static int hclge_restore_fd_entries(struct hnae3_handle *handle)
    if (!hnae3_dev_fd_supported(hdev))
    return -EOPNOTSUPP;

    + /* if fd is disabled, should not restore it when reset */
    + if (!hdev->fd_cfg.fd_en)
    + return 0;
    +
    hlist_for_each_entry_safe(rule, node, &hdev->fd_rule_list, rule_node) {
    ret = hclge_config_action(hdev, HCLGE_FD_STAGE_1, rule);
    if (!ret)
    --
    2.19.1


    \
     
     \ /
      Last update: 2019-02-11 17:01    [W:4.292 / U:0.120 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site