qed: Don't inherit RoCE DCBx for V2

Orabug: 26783820

Older firmware used by device didn't distinguish between RoCE and RoCE
V2 from DCBx configuration perspective, and as a result we've used to
take a the RoCE-related configuration and apply to it for both.

Since we now support configuring each its own values, there's no reason
to reflect [& configure] that both are using the same.

Signed-off-by: Sudarsana Reddy Kalluru <Sudarsana.Kalluru@cavium.com>
Signed-off-by: Yuval Mintz <Yuval.Mintz@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[ Upstream commit 38b23e43ee6f0903de989913884a2142bf8b3d7c ]
Signed-off-by: Somasundaram Krishnasamy <somasundaram.krishnasamy@oracle.com>

diff --git a/drivers/net/ethernet/qlogic/qed/qed_dcbx.c b/drivers/net/ethernet/qlogic/qed/qed_dcbx.c
index e01696a304e989691eb9bd39dd18ebbdbfa2bf8a..dbbb1ab6068a236fbbbbd5434f357ccbd63b4693 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_dcbx.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_dcbx.c
@@ -310,17 +310,6 @@ qed_dcbx_process_tlv(struct qed_hwfn *p_hwfn,
                }
        }
 
-       /* If RoCE-V2 TLV is not detected, driver need to use RoCE app
-        * data for RoCE-v2 not the default app data.
-        */
-       if (!p_data->arr[DCBX_PROTOCOL_ROCE_V2].update &&
-           p_data->arr[DCBX_PROTOCOL_ROCE].update) {
-               tc = p_data->arr[DCBX_PROTOCOL_ROCE].tc;
-               priority = p_data->arr[DCBX_PROTOCOL_ROCE].priority;
-               qed_dcbx_update_app_info(p_data, p_hwfn, true,
-                                        priority, tc, DCBX_PROTOCOL_ROCE_V2);
-       }
-
        /* Update ramrod protocol data and hw_info fields
         * with default info when corresponding APP TLV's are not detected.
         * The enabled field has a different logic for ethernet as only for