From patchwork Fri Oct 18 13:23:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirsher, Jeffrey T" X-Patchwork-Id: 284561 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 223052C00B1 for ; Sat, 19 Oct 2013 00:24:16 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754656Ab3JRNYG (ORCPT ); Fri, 18 Oct 2013 09:24:06 -0400 Received: from mga09.intel.com ([134.134.136.24]:41785 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754292Ab3JRNXl (ORCPT ); Fri, 18 Oct 2013 09:23:41 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 18 Oct 2013 06:20:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.93,522,1378882800"; d="scan'208";a="394964831" Received: from unknown (HELO jtkirshe-mobl.amr.corp.intel.com) ([10.255.15.250]) by orsmga001.jf.intel.com with ESMTP; 18 Oct 2013 06:23:25 -0700 From: Jeff Kirsher To: a@vger.kernel.org, davem@davemloft.net Cc: Jesse Brandeburg , netdev@vger.kernel.org, gospo@redhat.com, sassmann@redhat.com, Hannes Frederic Sowa , Jeff Kirsher Subject: [net-next 08/14] i40e: fix sign extension issue Date: Fri, 18 Oct 2013 06:23:12 -0700 Message-Id: <1382102598-11343-9-git-send-email-jeffrey.t.kirsher@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1382102598-11343-1-git-send-email-jeffrey.t.kirsher@intel.com> References: <1382102598-11343-1-git-send-email-jeffrey.t.kirsher@intel.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jesse Brandeburg This is a fix for an issue reported by coverity, reported by Hannes Frederic Sowa. Signed-off-by: Jesse Brandeburg CC: Hannes Frederic Sowa Tested-by: Kavindya Deegala Signed-off-by: Jeff Kirsher --- drivers/net/ethernet/intel/i40e/i40e_txrx.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c index fbc40cd..8fc313c 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c +++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c @@ -99,9 +99,9 @@ int i40e_program_fdir_filter(struct i40e_fdir_data *fdir_data, << I40E_TXD_FLTR_QW0_DEST_VSI_SHIFT); else fdir_desc->qindex_flex_ptype_vsi |= - cpu_to_le32((fdir_data->dest_vsi - << I40E_TXD_FLTR_QW0_DEST_VSI_SHIFT) - & I40E_TXD_FLTR_QW0_DEST_VSI_MASK); + cpu_to_le32((((u32)fdir_data->dest_vsi) << + I40E_TXD_FLTR_QW0_DEST_VSI_SHIFT) & + I40E_TXD_FLTR_QW0_DEST_VSI_MASK); fdir_desc->dtype_cmd_cntindex = cpu_to_le32(I40E_TX_DESC_DTYPE_FILTER_PROG); @@ -127,9 +127,9 @@ int i40e_program_fdir_filter(struct i40e_fdir_data *fdir_data, fdir_desc->dtype_cmd_cntindex |= cpu_to_le32(I40E_TXD_FLTR_QW1_CNT_ENA_MASK); fdir_desc->dtype_cmd_cntindex |= - cpu_to_le32((fdir_data->cnt_index - << I40E_TXD_FLTR_QW1_CNTINDEX_SHIFT) - & I40E_TXD_FLTR_QW1_CNTINDEX_MASK); + cpu_to_le32((((u32)fdir_data->cnt_index) << + I40E_TXD_FLTR_QW1_CNTINDEX_SHIFT) & + I40E_TXD_FLTR_QW1_CNTINDEX_MASK); } fdir_desc->fd_id = cpu_to_le32(fdir_data->fd_id);