qed: Separate RoCE DCBx support for V2.

Orabug: 26783820

In the older firmware there was no distinction between RoCE and RoCEv2
whereas the newer firmware (8.15.3.0) allows us to configure each
independently. Driver need to populate the RoCEv2 data in its specific
structure.

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 449ad505e9d2f420b7bf590a708c101ff587593e ]
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 7a8a55cf1094c1c714d78729a53a8c740d05aef4..2a2b701b2a795a9a57a3d2e0fa635dd688116b36 100644 (file)
--- a/drivers/net/ethernet/qlogic/qed/qed_dcbx.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_dcbx.c
@@ -951,14 +951,9 @@ void qed_dcbx_set_pf_update_params(struct qed_dcbx_results *p_src,
        p_dcb_data = &p_dest->fcoe_dcb_data;
        qed_dcbx_update_protocol_data(p_dcb_data, p_src, DCBX_PROTOCOL_FCOE);
        p_dcb_data = &p_dest->roce_dcb_data;
-
-       if (p_src->arr[DCBX_PROTOCOL_ROCE].update)
-               qed_dcbx_update_protocol_data(p_dcb_data, p_src,
-                                             DCBX_PROTOCOL_ROCE);
-       if (p_src->arr[DCBX_PROTOCOL_ROCE_V2].update)
-               qed_dcbx_update_protocol_data(p_dcb_data, p_src,
-                                             DCBX_PROTOCOL_ROCE_V2);
-
+       qed_dcbx_update_protocol_data(p_dcb_data, p_src, DCBX_PROTOCOL_ROCE);
+       p_dcb_data = &p_dest->rroce_dcb_data;
+       qed_dcbx_update_protocol_data(p_dcb_data, p_src, DCBX_PROTOCOL_ROCE_V2);
        p_dcb_data = &p_dest->iscsi_dcb_data;
        qed_dcbx_update_protocol_data(p_dcb_data, p_src, DCBX_PROTOCOL_ISCSI);
        p_dcb_data = &p_dest->eth_dcb_data;