From b729f76feba0b48f0a00563ff152cfc8a97e6973 Mon Sep 17 00:00:00 2001 From: shenhao Date: Sun, 26 Apr 2020 20:47:42 +0800 Subject: [PATCH] net: hns3: splice two "if" logic as one driver inclusion category: bugfix bugzilla: NA CVE: NA -------------------------------------------- When checks tuple in hclge_fd_check_ext_tuple(), two nested "if" is used as a logic judgment. It can be spliced as one,using "&&", which make code more readability. Signed-off-by: Guojia Liao Signed-off-by: shenhao Reviewed-by: Zhong Zhaohui Signed-off-by: Yang Yingliang --- drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c index 705274332da0..a620b20c149d 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c @@ -5513,10 +5513,9 @@ static int hclge_fd_check_ext_tuple(struct hclge_dev *hdev, if (!fs->h_ext.vlan_tci) *unused_tuple |= BIT(INNER_VLAN_TAG_FST); - if (fs->m_ext.vlan_tci) { - if (be16_to_cpu(fs->h_ext.vlan_tci) >= VLAN_N_VID) - return -EINVAL; - } + if (fs->m_ext.vlan_tci && + be16_to_cpu(fs->h_ext.vlan_tci) >= VLAN_N_VID) + return -EINVAL; } else { *unused_tuple |= BIT(INNER_VLAN_TAG_FST); } -- GitLab