From patchwork Wed Jul 19 20:57:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 791237 X-Patchwork-Delegate: joestringer@nicira.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="oVUayHlb"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xCTv545XNz9t2x for ; Thu, 20 Jul 2017 07:00:17 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id B1347B6D; Wed, 19 Jul 2017 20:57:29 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 14106B43 for ; Wed, 19 Jul 2017 20:57:27 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 2097912A for ; Wed, 19 Jul 2017 20:57:26 +0000 (UTC) Received: by mail-pf0-f196.google.com with SMTP id d18so810981pfe.4 for ; Wed, 19 Jul 2017 13:57:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cXSIpv1QxxqM5rnColxH0xOII3o9x5TLQvZZDURr/Vs=; b=oVUayHlbjt3I3Ng22F5pfVaGmXDYUjJMnxa9Se02MFlYCk8eGb4oHnDROzBwwF41rC BCqNnPnn2arOhOEmELJ7vWa/8EziwAf3aT7f5FRCjIzmbMl2IiKpwfXRwkX1nKIgBZtJ 66Pu8hvoBH0mm0eMh1Doi//oD8Xo06KBus/hp412W9+wz6XJYCgTIRUNDNM4rlzZwSlH AhX1WjQyfz+3pF/hQX7lJ7ZchV/MeyWqCdVYDJCXYIqKKXt9+WnDQSwl4cMq+IDRRylt 405Rswl1kcUUBsIpWtDaNPxhEV9jH/Sq+Yu7LA8i6Hdf/MxK8heqF4Ovid1L2goOh/tR ZfRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=cXSIpv1QxxqM5rnColxH0xOII3o9x5TLQvZZDURr/Vs=; b=f8yllOyHfYilbp6DSLjZ5Hsm0d62/uMXcqT3Qft6Tii8Ta5RSlYbd9cFeMjifeOVS1 k+exeZIjvSslKMwouLHSFhEniHxDFiLtr3w3lQmE+/Pa0CU92//Vet65ffh8BARFmEAn hFQWTms+UHJFQFwJg6SDoVMs/416GFetczst83PcwVx7g7psWU3ioNJrGbf7O/YoibUf lmvjYJyOZedAne5dSrR1gQItiT09t6KsGXU1i88iQLO4VmnGBBLdaEqjPeX4Rf27KCUZ Hjq06PHOhgv1AS9f+rmgkudleEodqwgwYvrJgZ0JsqVNDzSPKeVPawdoSNGLCFYaHhLz rirw== X-Gm-Message-State: AIVw110fXMoSRZanAzB7xzJ9clhdVpBbWXPN04f1KreZwjhJ7RYXJNji I5OiOp0UVDLTJslE X-Received: by 10.99.43.200 with SMTP id r191mr1363522pgr.321.1500497845391; Wed, 19 Jul 2017 13:57:25 -0700 (PDT) Received: from gizo.domain (184-100-139-69.ptld.qwest.net. [184.100.139.69]) by smtp.gmail.com with ESMTPSA id g79sm1171576pfd.163.2017.07.19.13.57.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Jul 2017 13:57:24 -0700 (PDT) From: Greg Rose To: dev@openvswitch.org Date: Wed, 19 Jul 2017 13:57:10 -0700 Message-Id: <1500497833-30066-6-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1500497833-30066-1-git-send-email-gvrose8192@gmail.com> References: <1500497833-30066-1-git-send-email-gvrose8192@gmail.com> X-Spam-Status: No, score=-1.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,RCVD_IN_SORBS_SPAM autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH 5/8] datapath: get rid of redundant vxlan_dev.flags X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Upstream commit: commit dc5321d79697db1b610c25fa4fad1aec7533ea3e Author: Matthias Schiffer Date: Mon Jun 19 10:03:56 2017 +0200 vxlan: get rid of redundant vxlan_dev.flags There is no good reason to keep the flags twice in vxlan_dev and vxlan_config. Signed-off-by: Matthias Schiffer Signed-off-by: David S. Miller Applied using HAVE_VXLAN_DEV_CFG compatibility flag defined in acinclude.m4. Signed-off-by: Greg Rose --- datapath/vport-vxlan.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/datapath/vport-vxlan.c b/datapath/vport-vxlan.c index 7beaf6e..62cdb2e 100644 --- a/datapath/vport-vxlan.c +++ b/datapath/vport-vxlan.c @@ -40,14 +40,22 @@ static int vxlan_get_options(const struct vport *vport, struct sk_buff *skb) if (nla_put_u16(skb, OVS_TUNNEL_ATTR_DST_PORT, ntohs(dst_port))) return -EMSGSIZE; +#ifdef HAVE_VXLAN_DEV_CFG + if (vxlan->cfg.flags & VXLAN_F_GBP) { +#else if (vxlan->flags & VXLAN_F_GBP) { +#endif struct nlattr *exts; exts = nla_nest_start(skb, OVS_TUNNEL_ATTR_EXTENSION); if (!exts) return -EMSGSIZE; +#ifdef HAVE_VXLAN_DEV_CFG + if (vxlan->cfg.flags & VXLAN_F_GBP && +#else if (vxlan->flags & VXLAN_F_GBP && +#endif nla_put_flag(skb, OVS_VXLAN_EXT_GBP)) return -EMSGSIZE;