From patchwork Thu Nov 8 17:44:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= X-Patchwork-Id: 10674743 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 22B621709 for ; Thu, 8 Nov 2018 17:51:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1684E2C2A2 for ; Thu, 8 Nov 2018 17:51:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0A79B2DE64; Thu, 8 Nov 2018 17:51:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 35D642DE66 for ; Thu, 8 Nov 2018 17:50:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727032AbeKID1b (ORCPT ); Thu, 8 Nov 2018 22:27:31 -0500 Received: from rere.qmqm.pl ([91.227.64.183]:21630 "EHLO rere.qmqm.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727040AbeKID1b (ORCPT ); Thu, 8 Nov 2018 22:27:31 -0500 Received: from remote.user (localhost [127.0.0.1]) by rere.qmqm.pl (Postfix) with ESMTPSA id 42rVyJ4l9dzXW; Thu, 8 Nov 2018 18:43:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rere.qmqm.pl; s=1; t=1541699032; bh=fQDBupRe+s8lK5WrNuWvvIFcK/mdqOTHfL1b4W/Ryc4=; h=Date:In-Reply-To:References:From:Subject:To:Cc:From; b=BrQ2yHChJPfL7TU9iyQuNSiC7Xy6hoiTqQkLExExlvlGVEQSeEEkkw+Fj0F8Q+DHr qGjyCvCjMi7T6Y70ZWSDXnonETOFw16XwviJCqOVaZjJr2JCX2DPkzc+s2e5fbg1YO hEGFVLXk1K1PFz++OWFe1+tv+nUAammBK8KDrIVgzd+A+h8K0xdJq8yAuYMCsiXII8 tDojowubVudZJKx2Z1DBRig5+vXmPmUST2KVsHw9CI7EVDHZjXrxJW8IQm/ZODsAIS hfYeYYauebOWpj9vVAYdViaeQDm15GpDhTyaz3d03PlIZVdyk1zRv9OeFy5BwjY0sJ wGlPyKDVEEOIw== X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.100.2 at mail Date: Thu, 08 Nov 2018 18:44:50 +0100 Message-Id: <5846b048f81792971776b063687d7b62575be570.1541698641.git.mirq-linux@rere.qmqm.pl> In-Reply-To: References: From: =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= Subject: [PATCH net-next 3/4] gianfar: remove use of VLAN_TAG_PRESENT MIME-Version: 1.0 To: netdev@vger.kernel.org Cc: Claudiu Manoil , Faisal Latif , Pravin B Shelar , Shiraz Saleem , dev@openvswitch.org, linux-rdma@vger.kernel.org Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Reviewed-by: Claudiu Manoil Signed-off-by: Michał Mirosław --- drivers/net/ethernet/freescale/gianfar_ethtool.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/freescale/gianfar_ethtool.c b/drivers/net/ethernet/freescale/gianfar_ethtool.c index 0d76e15cd6dd..241325c35cb4 100644 --- a/drivers/net/ethernet/freescale/gianfar_ethtool.c +++ b/drivers/net/ethernet/freescale/gianfar_ethtool.c @@ -1134,11 +1134,9 @@ static int gfar_convert_to_filer(struct ethtool_rx_flow_spec *rule, prio = vlan_tci_prio(rule); prio_mask = vlan_tci_priom(rule); - if (cfi == VLAN_TAG_PRESENT && cfi_mask == VLAN_TAG_PRESENT) { - vlan |= RQFPR_CFI; - vlan_mask |= RQFPR_CFI; - } else if (cfi != VLAN_TAG_PRESENT && - cfi_mask == VLAN_TAG_PRESENT) { + if (cfi_mask) { + if (cfi) + vlan |= RQFPR_CFI; vlan_mask |= RQFPR_CFI; } }