qed: Separate RoCE DCBx support for V2.

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>

diff --git a/drivers/net/ethernet/qlogic/qed/qed_dcbx.c b/drivers/net/ethernet/qlogic/qed/qed_dcbx.c
index 3d53d11..ea16850 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;