X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fice%2Fbase%2Fice_dcb.c;h=cb6c5ba1822d1ba8ec43366cccbc1083e35f5f2a;hb=61da0fe6c46ab11aeeeb8a9bd939b98ef50eca15;hp=c73fc095ff3153f09a3e13a8fb2d5148e94b15f6;hpb=32f5a9b34a977718b01c3854db17122b5ccbffc9;p=dpdk.git

diff --git a/drivers/net/ice/base/ice_dcb.c b/drivers/net/ice/base/ice_dcb.c
index c73fc095ff..cb6c5ba182 100644
--- a/drivers/net/ice/base/ice_dcb.c
+++ b/drivers/net/ice/base/ice_dcb.c
@@ -764,11 +764,10 @@ ice_aq_set_pfc_mode(struct ice_hw *hw, u8 pfc_mode, struct ice_sq_cd *cd)
 	if (status)
 		return status;
 
-	/* The spec isn't clear about whether the FW will return an error code
-	 * if the PFC mode requested by the driver was not set. The spec just
-	 * says that the FW will write the PFC mode set back into cmd->pfc_mode,
-	 * so after the AQ has been executed, check if cmd->pfc_mode is what was
-	 * requested.
+	/* FW will write the PFC mode set back into cmd->pfc_mode, but if DCB is
+	 * disabled, FW will write back 0 to cmd->pfc_mode. After the AQ has
+	 * been executed, check if cmd->pfc_mode is what was requested. If not,
+	 * return an error.
 	 */
 	if (cmd->pfc_mode != pfc_mode)
 		return ICE_ERR_NOT_SUPPORTED;
@@ -1524,7 +1523,8 @@ ice_aq_query_port_ets(struct ice_port_info *pi,
 		return ICE_ERR_PARAM;
 	cmd = &desc.params.port_ets;
 	ice_fill_dflt_direct_cmd_desc(&desc, ice_aqc_opc_query_port_ets);
-	cmd->port_teid = pi->root->info.node_teid;
+	if (pi->root)
+		cmd->port_teid = pi->root->info.node_teid;
 
 	status = ice_aq_send_cmd(pi->hw, &desc, buf, buf_size, cd);
 	return status;