From patchwork Sat Nov 10 18:55:34 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: 995946 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=rere.qmqm.pl Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=rere.qmqm.pl header.i=@rere.qmqm.pl header.b="blxMXuuw"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42smSC5DHMz9sC7 for ; Sun, 11 Nov 2018 05:55:39 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726518AbeKKElg (ORCPT ); Sat, 10 Nov 2018 23:41:36 -0500 Received: from rere.qmqm.pl ([91.227.64.183]:59018 "EHLO rere.qmqm.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726323AbeKKElg (ORCPT ); Sat, 10 Nov 2018 23:41:36 -0500 Received: from remote.user (localhost [127.0.0.1]) by rere.qmqm.pl (Postfix) with ESMTPSA id 42smQz13xQzBr; Sat, 10 Nov 2018 19:54:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=rere.qmqm.pl; s=1; t=1541876075; bh=V20KsBe/VpzOC4N+XwCzhD68YREFdhDVjRDTLqyPZsQ=; h=Date:From:Subject:To:Cc:From; b=blxMXuuwn349HMdhA4ptFCV/d1uE0JgK02WLOyxG+q3452CP2XhYBh74CBsSHFL2W QhgzLcjBkNkm8D56IafM6N3njIM2oPvgej1e/bfGIulLjnLZKCtB+K+Xtvbu2pjLw8 bxssx7OvPglCHploqInBk0QI+/ayrrNjWUnEH6Er9aYxLhYzAcDrHl9XKjR9ICPju3 SMgZ1nC3z5jjZLrDb2Lp2eoSEHoEftdNGZ8VuxrrJS5HFxi3V+57tD45JA0/Hnk96n bDOV/8LppNF+obImWEEUCjEgbsZUcEWMX2CL6mBOxqUQQHHAxIp4UxYwFJMnHEg5Ta PSMTuHQ4sfw4A== X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.100.2 at mail Date: Sat, 10 Nov 2018 19:55:34 +0100 Message-Id: <3a3f096a59e139d4149ef57d247639286bba9593.1541875851.git.mirq-linux@rere.qmqm.pl> From: =?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= Subject: [PATCH net-next] OVS: remove VLAN_TAG_PRESENT - fixup MIME-Version: 1.0 To: netdev@vger.kernel.org Cc: Pravin B Shelar , dev@openvswitch.org Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org It turns out I missed one VLAN_TAG_PRESENT in OVS code while rebasing. This fixes it. Fixes: 9df46aefafa6 ("OVS: remove use of VLAN_TAG_PRESENT") Signed-off-by: Michał Mirosław --- net/openvswitch/flow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c index fa393815991e..57e07768c9d1 100644 --- a/net/openvswitch/flow.c +++ b/net/openvswitch/flow.c @@ -597,7 +597,7 @@ static int key_extract(struct sk_buff *skb, struct sw_flow_key *key) * skb_vlan_pop(), which will later shift the ethertype into * skb->protocol. */ - if (key->eth.cvlan.tci & htons(VLAN_TAG_PRESENT)) + if (key->eth.cvlan.tci & htons(VLAN_CFI_MASK)) skb->protocol = key->eth.cvlan.tpid; else skb->protocol = key->eth.type;