From: sudarsana.kalluru@cavium.com Date: Wed, 19 Apr 2017 10:19:53 +0000 (-0700) Subject: qed: Fix sending an invalid PFC error mask to MFW. X-Git-Tag: v4.1.12-111.0.20170918_2215~149 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=362a0d9777172c1f93e4e812fb6e314ccf4f9755;p=users%2Fjedix%2Flinux-maple.git qed: Fix sending an invalid PFC error mask to MFW. Orabug: 26783820 PFC error-mask value is not supported by MFW, but this bit could be set in the pfc bit-map of the operational parameters if remote device supports it. These operational parameters are used as basis for populating the dcbx config parameters. User provided configs will be applied on top of these parameters and then send them to MFW when requested. Driver need to clear the error-mask bit before sending the config parameters to MFW. Signed-off-by: Sudarsana Reddy Kalluru Signed-off-by: Yuval Mintz Signed-off-by: David S. Miller [ Upstream commit 6cf75f1cebb048cfc1424b4b8ac9bbc08d5f9f66 ] Signed-off-by: Somasundaram Krishnasamy --- diff --git a/drivers/net/ethernet/qlogic/qed/qed_dcbx.c b/drivers/net/ethernet/qlogic/qed/qed_dcbx.c index 46a63c289f98c..e2699d5a31b52 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_dcbx.c +++ b/drivers/net/ethernet/qlogic/qed/qed_dcbx.c @@ -1006,6 +1006,8 @@ qed_dcbx_set_pfc_data(struct qed_hwfn *p_hwfn, u8 pfc_map = 0; int i; + *pfc &= ~DCBX_PFC_ERROR_MASK; + if (p_params->pfc.willing) *pfc |= DCBX_PFC_WILLING_MASK; else