From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?unknown-8bit?q?J=CE=B5an?= Sacren Date: Tue, 13 Oct 2015 01:06:32 -0600 Subject: [Intel-wired-lan] [next-queue v2 6/6] i40e: fix unconditional execution of cpu_to_le16() In-Reply-To: <1444719992-301-1-git-send-email-sakiwit@gmail.com> References: <1444719992-301-1-git-send-email-sakiwit@gmail.com> Message-ID: <1444719992-301-6-git-send-email-sakiwit@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: intel-wired-lan@osuosl.org List-ID: From: Jean Sacren The commit 3092e5e4cc79 ("i40e: add little endian conversion for checksum") fixed the checksum bug on big-endian architecture. But we should not execute cpu_to_le16() unconditionally. Thus, put cpu_to_le16() under certain condition. Signed-off-by: Jean Sacren Cc: Jesse Brandeburg Cc: Paul M Stillwell Jr --- v2: Update patch serial number and add CC to Paul M Stillwell Jr. drivers/net/ethernet/intel/i40e/i40e_nvm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/intel/i40e/i40e_nvm.c b/drivers/net/ethernet/intel/i40e/i40e_nvm.c index 1715358a8a6c..6100cdd9ad13 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_nvm.c +++ b/drivers/net/ethernet/intel/i40e/i40e_nvm.c @@ -569,10 +569,11 @@ i40e_status i40e_update_nvm_checksum(struct i40e_hw *hw) __le16 le_sum; ret_code = i40e_calc_nvm_checksum(hw, &checksum); - le_sum = cpu_to_le16(checksum); - if (!ret_code) + if (!ret_code) { + le_sum = cpu_to_le16(checksum); ret_code = i40e_write_nvm_aq(hw, 0x00, I40E_SR_SW_CHECKSUM_WORD, 1, &le_sum, true); + } return ret_code; }