From patchwork Thu Jan 22 22:53:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 432015 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 41BAF140273 for ; Fri, 23 Jan 2015 09:53:57 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754289AbbAVWxl (ORCPT ); Thu, 22 Jan 2015 17:53:41 -0500 Received: from mail-lb0-f180.google.com ([209.85.217.180]:36235 "EHLO mail-lb0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751597AbbAVWxk (ORCPT ); Thu, 22 Jan 2015 17:53:40 -0500 Received: by mail-lb0-f180.google.com with SMTP id b6so4191601lbj.11 for ; Thu, 22 Jan 2015 14:53:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rasmusvillemoes.dk; s=google; h=from:to:cc:subject:date:message-id; bh=fqsdV9mhGGDRJjwzrBr0HNdAaIssZFANPhwzJ3ZZVwA=; b=R7Dt26Y5q+d+ZSGlt/xlnpUiUEj6ZPGoshobZRd40VJp64WuFbDvAFSpm+zpPssBtn Ywijg71mOYH5x//vU37lKhBfPSh4Adbd5XOHdioKW5hkHeHhgd53RZdXmm9iT+aredgJ XDYMY3qL8VhocjlHNNGGC7LsSANHlXrri3xk0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=fqsdV9mhGGDRJjwzrBr0HNdAaIssZFANPhwzJ3ZZVwA=; b=U04LAe9YYE4xPJtQsUP/HRWzgSV+Y/xax2kQMaVEwW9GY5E4uE6E8nyjZLorifwJui KsxlfTPFLi9jJJiOvfHEipXoAGDrNunPBMOK5rMN2o5PHIUkNAkH2IvuCH/ocKVTrpvL 1SVvgkTev7ZZp6TGOSxduizpSXtH5gXsvbW4BMxWYsQwyuG3gC7VJEClMyvo+OIRhV9+ /KnIYHtMa1tgSDlStFQ3TYsVyE5/yJim9caKQgv+NzE/XOjIW1dpGbJm5d/u6EqIRgmO NlVvbyDXOsEt2F32uicuNJkfMRHOaiZf2Fe+bluHJIany0Kda2gPDeJ6gtyi3fDzuSjs 8jAw== X-Gm-Message-State: ALoCoQkjBncoOUsa8J7VjTuK0TKYq9KdO4koed+nVX3dfBbsgXhLWSskU9BNqWkkq81WoacaD/1a X-Received: by 10.152.178.197 with SMTP id da5mr2252330lac.87.1421967218386; Thu, 22 Jan 2015 14:53:38 -0800 (PST) Received: from spencer.imf.au.dk ([130.225.20.51]) by mx.google.com with ESMTPSA id jf3sm6100495lbc.44.2015.01.22.14.53.36 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Jan 2015 14:53:37 -0800 (PST) From: Rasmus Villemoes To: Alexander Duyck , Jeff Kirsher Cc: Rasmus Villemoes , e1000-devel@lists.sourceforge.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] ethernet: fm10k: Actually drop 4 bits Date: Thu, 22 Jan 2015 23:53:18 +0100 Message-Id: <1421967198-16667-1-git-send-email-linux@rasmusvillemoes.dk> X-Mailer: git-send-email 2.1.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The comment explains the intention, but vid has type u16. Before the inner shift, it is promoted to int, which has plenty of space for all vid's bits, so nothing is dropped. Use a simple mask instead. Signed-off-by: Rasmus Villemoes --- drivers/net/ethernet/intel/fm10k/fm10k_pf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pf.c b/drivers/net/ethernet/intel/fm10k/fm10k_pf.c index 275423d4f777..b1c57d0166a9 100644 --- a/drivers/net/ethernet/intel/fm10k/fm10k_pf.c +++ b/drivers/net/ethernet/intel/fm10k/fm10k_pf.c @@ -335,7 +335,7 @@ static s32 fm10k_update_xc_addr_pf(struct fm10k_hw *hw, u16 glort, return FM10K_ERR_PARAM; /* drop upper 4 bits of VLAN ID */ - vid = (vid << 4) >> 4; + vid &= 0x0fff; /* record fields */ mac_update.mac_lower = cpu_to_le32(((u32)mac[2] << 24) |