RDMA/hns: Logic optimization of wc_flags

We should set IB_WC_WITH_VLAN only when VLAN is enabled.
In addition, move setting of IB_WC_WITH_SMAC below
setting of wc->smac.

Signed-off-by: Weihang Li <liweihang@hisilicon.com>
Link: https://lore.kernel.org/r/1565343666-73193-2-git-send-email-oulijun@huawei.com
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
index 87a1574..7a14f0b 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
+++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
@@ -2860,15 +2860,16 @@ static int hns_roce_v2_poll_one(struct hns_roce_cq *hr_cq,
                wc->smac[5] = roce_get_field(cqe->byte_28,
                                             V2_CQE_BYTE_28_SMAC_5_M,
                                             V2_CQE_BYTE_28_SMAC_5_S);
+               wc->wc_flags |= IB_WC_WITH_SMAC;
                if (roce_get_bit(cqe->byte_28, V2_CQE_BYTE_28_VID_VLD_S)) {
                        wc->vlan_id = (u16)roce_get_field(cqe->byte_28,
                                                          V2_CQE_BYTE_28_VID_M,
                                                          V2_CQE_BYTE_28_VID_S);
+                       wc->wc_flags |= IB_WC_WITH_VLAN;
                } else {
                        wc->vlan_id = 0xffff;
                }
 
-               wc->wc_flags |= (IB_WC_WITH_VLAN | IB_WC_WITH_SMAC);
                wc->network_hdr_type = roce_get_field(cqe->byte_28,
                                                    V2_CQE_BYTE_28_PORT_TYPE_M,
                                                    V2_CQE_BYTE_28_PORT_TYPE_S);