From: Jacob Keller Date: Fri, 1 Sep 2017 20:43:08 +0000 (-0700) Subject: i40e: point wb_desc at the nvm_wb_desc during i40e_read_nvm_aq X-Git-Tag: v4.1.12-117.0_27200813_3~206 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=837bac84c81491f15f8ac5c56b32c63a8bf7bb38;p=users%2Fjedix%2Flinux-maple.git i40e: point wb_desc at the nvm_wb_desc during i40e_read_nvm_aq When introducing the functions to read the NVM through the AdminQ, we did not correctly mark the wb_desc. Fixes: 7073f46e443e ("i40e: Add AQ commands for NVM Update for X722", 2015-06-05) Signed-off-by: Jacob Keller Tested-by: Andrew Bowers Signed-off-by: Jeff Kirsher Orabug: 26785018 (cherry picked from commit 3c8f3e96af3a6799841761923d000566645f0942) Signed-off-by: Jack Vogel Reviewed-by: Kyle Fortin --- diff --git a/drivers/net/ethernet/intel/i40e/i40e_nvm.c b/drivers/net/ethernet/intel/i40e/i40e_nvm.c index e29b193d8510..57505b1df98d 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_nvm.c +++ b/drivers/net/ethernet/intel/i40e/i40e_nvm.c @@ -247,6 +247,7 @@ static i40e_status i40e_read_nvm_aq(struct i40e_hw *hw, u8 module_pointer, struct i40e_asq_cmd_details cmd_details; memset(&cmd_details, 0, sizeof(cmd_details)); + cmd_details.wb_desc = &hw->nvm_wb_desc; /* Here we are checking the SR limit only for the flat memory model. * We cannot do it for the module-based model, as we did not acquire