From patchwork Wed May 11 09:22:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhaoxiu Zeng X-Patchwork-Id: 620943 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 3r4W3N42NWz9t6h for ; Wed, 11 May 2016 19:26:56 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=163.com header.i=@163.com header.b=Zy8TgMNy; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932394AbcEKJYG (ORCPT ); Wed, 11 May 2016 05:24:06 -0400 Received: from m50-135.163.com ([123.125.50.135]:47641 "EHLO m50-135.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932286AbcEKJYA (ORCPT ); Wed, 11 May 2016 05:24:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=nN8pOtyNDC0x/3Lsi2 nVvElcTIVWrJzlLimD4wFihG8=; b=Zy8TgMNyYSNt8f0xAoTdLD9Gv0eeLhUkmW bQUumqScaH7c2WDwCrBXpTM7xx13tHhSXU8WxMACQKTsntyRtnt19tcGmdzJu3Y1 oSfZQ15I9kDPzku3alFErcfBEdPlWdk3MbE3QdA/xVRYdQYGamCKPsz/z1CZDpQ4 X+gZlSetA= Received: from zhaoxiuzeng-VirtualBox.spreadtrum.com (unknown [112.95.225.98]) by smtp5 (Coremail) with SMTP id D9GowAA3PEDN+TJXru5CAA--.9379S2; Wed, 11 May 2016 17:22:24 +0800 (CST) From: zengzhaoxiu@163.com To: linux-kernel@vger.kernel.org Cc: Zhaoxiu Zeng , Michal Nazarewicz , Joonsoo Kim , Andrew Morton , Vlastimil Babka , Jiri Pirko , netdev@vger.kernel.org Subject: [patch V4 23/31] ethernet: use parity8 in sun/niu.c Date: Wed, 11 May 2016 17:22:17 +0800 Message-Id: <1462958539-25752-1-git-send-email-zengzhaoxiu@163.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1462955158-28394-1-git-send-email-zengzhaoxiu@163.com> References: <1462955158-28394-1-git-send-email-zengzhaoxiu@163.com> X-CM-TRANSID: D9GowAA3PEDN+TJXru5CAA--.9379S2 X-Coremail-Antispam: 1Uf129KBjvdXoWruw1UAF4fuFW8uw43Kw4fGrg_yoWDCFcEka 4jqF1fuFWUK3yYkr4qkr47A34Y9w1kZrWfWa40yrW3XFnrur15trn5uFy3Jrs5Wa1xWF9r Jr43JayfJ3yIvjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUe20P3UUUUU== X-Originating-IP: [112.95.225.98] X-CM-SenderInfo: p2hqw6xkdr5xrx6rljoofrz/xtbByhFmgFO+jXohGAAAse Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Zhaoxiu Zeng Signed-off-by: Zhaoxiu Zeng Acked-by: Michal Nazarewicz Acked-by: David S. Miller --- drivers/net/ethernet/sun/niu.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c index 9cc4564..8c344ef 100644 --- a/drivers/net/ethernet/sun/niu.c +++ b/drivers/net/ethernet/sun/niu.c @@ -2742,18 +2742,12 @@ static int niu_set_alt_mac_rdc_table(struct niu *np, int idx, static u64 vlan_entry_set_parity(u64 reg_val) { - u64 port01_mask; - u64 port23_mask; - - port01_mask = 0x00ff; - port23_mask = 0xff00; - - if (hweight64(reg_val & port01_mask) & 1) + if (parity8(reg_val)) reg_val |= ENET_VLAN_TBL_PARITY0; else reg_val &= ~ENET_VLAN_TBL_PARITY0; - if (hweight64(reg_val & port23_mask) & 1) + if (parity8((unsigned int)reg_val >> 8)) reg_val |= ENET_VLAN_TBL_PARITY1; else reg_val &= ~ENET_VLAN_TBL_PARITY1;