Received: by 2002:a25:ef43:0:0:0:0:0 with SMTP id w3csp1001824ybm; Fri, 29 May 2020 18:12:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz9d456/RLYnC/23YfHL8LqjOQD8lvHQEN0PE2WMrN2oVK+HwfBtFHsByqfEY8PXV445WyD X-Received: by 2002:a17:906:1b48:: with SMTP id p8mr9392350ejg.399.1590801165583; Fri, 29 May 2020 18:12:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590801165; cv=none; d=google.com; s=arc-20160816; b=njSzhy7ilQE6Z/BngfU92Efxpe039OY1XkaIdggwIA+1iJjDmajhlZkSm51FKzMhAg vsG3C/WB0ZiTtPKi/Q9urtY0ekDQ9rOgq4sfryWgeRCtreCUKOuN5q4y4XjFh9vpLs+p 7IZvho1thdaxf6oANuebgYUACFunhsFWow+Z9v7oVtVN0Z1YS0FRnttj8v5vSJAJh/JU +9gslNNVj4ki5F5ARqbBIU5OB5UsiP5Ofzl5RYE9Y8FiP0aSkt9igZqyC0cxMkE21xTH tNMQqT1JTl1MVt5BzRSKwiyx7qAaNI+CnxpD0GErWNlJVqSYMppiMnXh+cweoEp26EbR Gmgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=EKkrJPDNsT+cIyfjBolAywWIyae0qSlxNqoJEh/VIbU=; b=c4PHcNY8tM1BUbmE8TmGYHCqYFkQm0OT7+3K9987EFSX7Ref5fOI8C2V2WfjBvLGQD 3eTSQySwPAKF/Zt6y2liQvXhSWZjK2t5hvhw3IxNJnLQTkQQEBb0bn4VJLJByjvb93ea vZJGNNTqbTM0Oj7KJC8ZnLj7JHOoJntleToMijHtwNX3pC9B+iO4Kgx9D7cR7udNXYXB 9zKIvCYo8LhMg6GPuhmkI/fFby4Jt7BcONCVEn5wyosOTsU4kVdpdOFVFIxtbWCrjnwD 3+GdMY8kC45pypTw3l2egSkkobu0byiMY0ekQQ+NCvXZUK09x289wZ1uP5qBwmJ84rjR w9wQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id l5si207663ede.477.2020.05.29.18.12.23; Fri, 29 May 2020 18:12:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728642AbgE3BKK (ORCPT + 99 others); Fri, 29 May 2020 21:10:10 -0400 Received: from szxga07-in.huawei.com ([45.249.212.35]:49996 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728624AbgE3BKI (ORCPT ); Fri, 29 May 2020 21:10:08 -0400 Received: from DGGEMS401-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id BE2C4275174B2C4C86B9; Sat, 30 May 2020 09:10:06 +0800 (CST) Received: from localhost.localdomain (10.69.192.56) by DGGEMS401-HUB.china.huawei.com (10.3.19.201) with Microsoft SMTP Server id 14.3.487.0; Sat, 30 May 2020 09:09:59 +0800 From: Huazhong Tan To: CC: , , , , , , Huazhong Tan Subject: [PATCH net-next 6/6] net: hns3: remove some unused codes in hns3_nic_set_features() Date: Sat, 30 May 2020 09:08:32 +0800 Message-ID: <1590800912-52467-7-git-send-email-tanhuazhong@huawei.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1590800912-52467-1-git-send-email-tanhuazhong@huawei.com> References: <1590800912-52467-1-git-send-email-tanhuazhong@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.69.192.56] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org NETIF_F_HW_VLAN_CTAG_FILTER is not set in netdev->hw_feature for the HNS3 driver, so the handler of NETIF_F_HW_VLAN_CTAG_FILTER in hns3_nic_set_features() won't be called, remove it. Reported-by: Jian Shen Signed-off-by: Huazhong Tan --- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c index 9fe40c7..b14f2ab 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c @@ -1544,12 +1544,6 @@ static int hns3_nic_set_features(struct net_device *netdev, return ret; } - if ((changed & NETIF_F_HW_VLAN_CTAG_FILTER) && - h->ae_algo->ops->enable_vlan_filter) { - enable = !!(features & NETIF_F_HW_VLAN_CTAG_FILTER); - h->ae_algo->ops->enable_vlan_filter(h, enable); - } - if ((changed & NETIF_F_HW_VLAN_CTAG_RX) && h->ae_algo->ops->enable_hw_strip_rxvtag) { enable = !!(features & NETIF_F_HW_VLAN_CTAG_RX); -- 2.7.4