bnx2x: Utilize FW 7.12.30

[firefly-linux-kernel-4.4.55.git] / drivers / net / ethernet / broadcom / bnx2x / bnx2x_dcb.c

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
index fb26bc4c42a1fd03d42ef885dc562bcf4d460ade..b50f15496427e9d3266c4317fd15a8bf2b0ec0ff 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
@@ -1850,6 +1850,8 @@ static void bnx2x_dcbx_fw_struct(struct bnx2x *bp,
                        if (bp->dcbx_port_params.ets.cos_params[cos].
                                                pri_bitmask & pri_bit)
                                        tt2cos[pri].cos = cos;
+
+               pfc_fw_cfg->dcb_outer_pri[pri]  = ttp[pri];
        }
 
        /* we never want the FW to add a 0 vlan tag */
@@ -2092,7 +2094,6 @@ static void bnx2x_dcbnl_get_pfc_cfg(struct net_device *netdev, int prio,
 static u8 bnx2x_dcbnl_set_all(struct net_device *netdev)
 {
        struct bnx2x *bp = netdev_priv(netdev);
-       int rc = 0;
 
        DP(BNX2X_MSG_DCB, "SET-ALL\n");
 
@@ -2110,9 +2111,7 @@ static u8 bnx2x_dcbnl_set_all(struct net_device *netdev)
                                       1);
                bnx2x_dcbx_init(bp, true);
        }
-       DP(BNX2X_MSG_DCB, "set_dcbx_params done (%d)\n", rc);
-       if (rc)
-               return 1;
+       DP(BNX2X_MSG_DCB, "set_dcbx_params done\n");
 
        return 0;
 }