| From 8b535a73a40220374f468447cf6051bec36bf8b2 Mon Sep 17 00:00:00 2001 |
| From: Chinh T Cao <chinh.t.cao@intel.com> |
| Date: Mon, 5 Nov 2018 12:18:35 -0800 |
| Subject: ice: Change req_speeds to be u16 |
| |
| [ Upstream commit ffe498237b36ee42624e139b21efa05da4ff1f48 ] |
| |
| Since the req_speeds field in struct ice_link_status is a u8, |
| req_speeds & ICE_AQ_LINK_SPEED_40GB always returns 0. This was caught |
| by a coverity scan. |
| |
| Fix this by changing req_speeds to be u16. |
| |
| Reported-by: Bruce Allan <bruce.w.allan@intel.com> |
| Signed-off-by: Chinh T Cao <chinh.t.cao@intel.com> |
| Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com> |
| Tested-by: Andrew Bowers <andrewx.bowers@intel.com> |
| Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/intel/ice/ice_type.h | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/net/ethernet/intel/ice/ice_type.h b/drivers/net/ethernet/intel/ice/ice_type.h |
| index 97c366e0ca59..ba11b5898833 100644 |
| --- a/drivers/net/ethernet/intel/ice/ice_type.h |
| +++ b/drivers/net/ethernet/intel/ice/ice_type.h |
| @@ -83,12 +83,12 @@ struct ice_link_status { |
| u64 phy_type_low; |
| u16 max_frame_size; |
| u16 link_speed; |
| + u16 req_speeds; |
| u8 lse_ena; /* Link Status Event notification */ |
| u8 link_info; |
| u8 an_info; |
| u8 ext_info; |
| u8 pacing; |
| - u8 req_speeds; |
| /* Refer to #define from module_type[ICE_MODULE_TYPE_TOTAL_BYTE] of |
| * ice_aqc_get_phy_caps structure |
| */ |
| -- |
| 2.17.1 |
| |
