From patchwork Mon Jun 4 20:14:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 925209 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; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="EztE8UVo"; 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 4105kt1T2Qz9rxs for ; Tue, 5 Jun 2018 06:14:45 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id D699FCC7; Mon, 4 Jun 2018 20:14:43 +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 99871CC3 for ; Mon, 4 Jun 2018 20:14:42 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf0-f195.google.com (mail-pf0-f195.google.com [209.85.192.195]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 5F4C36FA for ; Mon, 4 Jun 2018 20:14:42 +0000 (UTC) Received: by mail-pf0-f195.google.com with SMTP id x9-v6so16577013pfm.2 for ; Mon, 04 Jun 2018 13:14:42 -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; bh=z2edr73XYblRXGtH9lAgGxXLCrVecJ6W5lrS6H85A88=; b=EztE8UVo1P7yWxfgLKiJTx906lcXxGPQhy6H83gDMZc8BI8j3zmko1SGSFhUXH6Tgu BaYP2LCBYnIBXqIOr+OPTxTi+4Gr9tbFVSTm8JjRQserl6Wk+/nRX57kQ9Ox7n6sX3gN EhodfdOOeRoz+xkf4CRjnln9bWjsvLts5myWVivgyOvkfez/yovN5FnCVQSUfzrc10qu wi+KRLI65c0LAI7te5aaoYEOX70gVpJDqKgCyJ7gvgAyRWgWTFvpyy4gn/9vQJAVLrMt FRyde2PH8mEe1W4HJiIlYMpsgiz4RtNiJCBHwxJZ7+44DTxeZ4sgBz7ZGsb5CJvpfe96 njuA== 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; bh=z2edr73XYblRXGtH9lAgGxXLCrVecJ6W5lrS6H85A88=; b=lzaHzVAcMUrztM4xD+QV6jSAUc+mNBRZuYpL7H43vwluG59R+wsr/PmOi3w7HodG3B Ri6p9blTB/XL6GlU3QFQvP0nv0iCebBhZgfD7ES+5zGGyT2F7u+wqJLo4NoOWYu4/A2O rkwnBE50jtM0fUCeQcv9my6olXy0Ibfr/cuscjd3WOZFxsjteWhP0yQ9PSwrOwT0b33y 8fEW79hdETcgBf35UkSiRtYOC1+plxFKRKCngKcqzlM9TVtBD5d8WdeBAcnuGMBQwa7q jHRfcGWkBw/AYkyBqbjSYajsX8ahmAd5fAwyJh8CFD4DGsqMvONgqBBPQbdJb+oOs5DG iOpQ== X-Gm-Message-State: ALKqPwfDdwWjZZlTfS+nPSE29rnJP6XBqwFM/ZW6COWbFN/rgF4VZa54 PV3GI+O6nr+0XNdvuhbfdn3Pog== X-Google-Smtp-Source: ADUXVKINVcAKJeTVaZVBcXUVPGbzNYFMlzGJ9cqc4Go49o4uOD0WwxN0XMSg90rR+qH9Hwi333WAHA== X-Received: by 2002:a63:7b4e:: with SMTP id k14-v6mr18287042pgn.261.1528143281733; Mon, 04 Jun 2018 13:14:41 -0700 (PDT) Received: from gizo.domain ([97.115.155.245]) by smtp.gmail.com with ESMTPSA id t3-v6sm13831083pfk.161.2018.06.04.13.14.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Jun 2018 13:14:41 -0700 (PDT) From: Greg Rose To: dev@openvswitch.org Date: Mon, 4 Jun 2018 13:14:36 -0700 Message-Id: <1528143278-982-1-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE 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 1/3] Revert "dpif: Ensure ERSPAN GRE support" 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 This reverts commit 8929c55287abae37efeac1e8876e6b3c2ccad0b9. This is the wrong direction for the solution to the ip_gre/gre kernel module conflicts. Signed-off-by: Greg Rose Acked-by: William Tu --- lib/dpif-netlink-rtnl.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/dpif-netlink-rtnl.c b/lib/dpif-netlink-rtnl.c index 197cfb6..bec3fce 100644 --- a/lib/dpif-netlink-rtnl.c +++ b/lib/dpif-netlink-rtnl.c @@ -45,8 +45,8 @@ VLOG_DEFINE_THIS_MODULE(dpif_netlink_rtnl); #ifndef IFLA_GRE_MAX #define IFLA_GRE_MAX 0 #endif -#if IFLA_GRE_MAX < 24 -#define IFLA_GRE_ERSPAN_HWID 24 +#if IFLA_GRE_MAX < 18 +#define IFLA_GRE_COLLECT_METADATA 18 #endif #ifndef IFLA_GENEVE_MAX @@ -74,7 +74,7 @@ static const struct nl_policy vxlan_policy[] = { [IFLA_VXLAN_GPE] = { .type = NL_A_FLAG, .optional = true }, }; static const struct nl_policy gre_policy[] = { - [IFLA_GRE_ERSPAN_HWID] = { .type = NL_A_U16 }, + [IFLA_GRE_COLLECT_METADATA] = { .type = NL_A_FLAG }, }; static const struct nl_policy geneve_policy[] = { [IFLA_GENEVE_COLLECT_METADATA] = { .type = NL_A_FLAG }, @@ -207,7 +207,7 @@ dpif_netlink_rtnl_gre_verify(const struct netdev_tunnel_config OVS_UNUSED *tnl, err = rtnl_policy_parse(kind, reply, gre_policy, gre, ARRAY_SIZE(gre_policy)); if (!err) { - if (!nl_attr_get_u16(gre[IFLA_GRE_ERSPAN_HWID])) { + if (!nl_attr_get_flag(gre[IFLA_GRE_COLLECT_METADATA])) { err = EINVAL; } } @@ -328,7 +328,7 @@ dpif_netlink_rtnl_create(const struct netdev_tunnel_config *tnl_cfg, case OVS_VPORT_TYPE_ERSPAN: case OVS_VPORT_TYPE_IP6ERSPAN: case OVS_VPORT_TYPE_IP6GRE: - nl_msg_put_u16(&request, IFLA_GRE_ERSPAN_HWID, 0xdead); + nl_msg_put_flag(&request, IFLA_GRE_COLLECT_METADATA); break; case OVS_VPORT_TYPE_GENEVE: nl_msg_put_flag(&request, IFLA_GENEVE_COLLECT_METADATA);