net: hns3: fix expression that is currently always true

The ||  condition in hdev->fd_active_type != HCLGE_FD_ARFS_ACTIVE ||
hdev->fd_active_type != HCLGE_FD_RULE_NONE will always be true because
hdev->fd_active_type cannot be equal to two different values at the same
time. The expression is always true which is not correct. Fix this by
replacing || with && to correct the logic in the expression.

Addresses-Coverity: ("Constant expression result")
Fixes: 0205ec041ec6 ("net: hns3: add support for hw tc offload of tc flower")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Reviewed-by: Huazhong Tan <tanhuazhong@huawei.com>
Link: https://lore.kernel.org/r/20201215000033.85383-1-colin.king@canonical.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index 7a164115c845f6a666de2d6d242c1aeeccb6e423..e6f37f91c489d1aa218ae124d7835b4d558875dc 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -6485,7 +6485,7 @@ static int hclge_add_fd_entry_by_arfs(struct hnae3_handle *handle, u16 queue_id,
         * arfs should not work
         */
        spin_lock_bh(&hdev->fd_rule_lock);
-       if (hdev->fd_active_type != HCLGE_FD_ARFS_ACTIVE ||
+       if (hdev->fd_active_type != HCLGE_FD_ARFS_ACTIVE &&
            hdev->fd_active_type != HCLGE_FD_RULE_NONE) {
                spin_unlock_bh(&hdev->fd_rule_lock);
                return -EOPNOTSUPP;