From patchwork Tue Oct 8 23:51:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 1173552 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="ZyhzD9T8"; 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 46nvJF5PG2z9sPL for ; Wed, 9 Oct 2019 10:51:24 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 6F3C9C64; Tue, 8 Oct 2019 23:51:20 +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 550499E7 for ; Tue, 8 Oct 2019 23:51:19 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 5B839604 for ; Tue, 8 Oct 2019 23:51:18 +0000 (UTC) Received: by mail-pf1-f195.google.com with SMTP id q10so388664pfl.0 for ; Tue, 08 Oct 2019 16:51:18 -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=TUZsMBSgaZe6pDDVyJ1D3MlIppe7mklGl9ZCCm9Jk80=; b=ZyhzD9T8KqdNDmAyADT3OyeiW+aaz3+6kcgpOnvLx/uU4xXFf6Aib259iHCtvf+7Lb tOZh2Ho/bk8gqBC+cjDllZBO6XU/+esofbPJPxPRoZPkMA1tMu8cjzkWqL6QXuU6h1HC C/SDFS/pUW7j/LSCGmJAR3son0unXJxsL3Y+qcn7Z5fdyd8T+Ztkeok7E99LlAqzHHXq 6i+bcQ9DU6yKnjR/D/3IQ9Y3qQj4CrBDyHubHUl57w59+dFCRkQ34WPymuyW1CoQMS61 4uYO9pW4g83qyew8Q+IvAx+0Ri9P9SsAuFPRttOc8zz4P4LBmpCjRTa59ie0QJ+yl4gt /DVA== 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=TUZsMBSgaZe6pDDVyJ1D3MlIppe7mklGl9ZCCm9Jk80=; b=ff+y/B+yRHAqKSxOHUeDj4ZQwMFYy1W85If435ia4QsEkx1himnX8WLAHXhxoavp/E Mou6AXfERBhYpI864/kXH8TnQD7KfgYarA97RgVSokoNJLvrDJyqE8N+D0SYaXGieqAw v6En7MSirPDzQu0NtvWD2TcEKK7oMuTRs3zRXQwaeMf+7eVpsLoXrhUMoP4CaSbDe4vT OpzS9O0zvq5v7VYWF75q7i7PFXzoRyNkAuv/w/j2E7JRMn1s3kNM5pMTe0L30Ffm4e3h dl9pZDseoSwDzsiBWnOi04pFQH15KjB57b9L6hoe9nl7YgqWYUCSbkRCtkeVsIyti8sY UwDA== X-Gm-Message-State: APjAAAVecfOvtdqTu4SgVDXzI52SMLQrmX9wU9R+xGLQ+8zEcrc4xjz7 C3Kkov/W4XZX6jJQzC815nRYUAV9 X-Google-Smtp-Source: APXvYqzWF2VvuUVj23ovfTCgald2AlwtWFWv5LuUlAhF112DexT4fcLgQnJ1NGWCfwF07dZEWtqISw== X-Received: by 2002:a17:90a:80ca:: with SMTP id k10mr536741pjw.88.1570578677198; Tue, 08 Oct 2019 16:51:17 -0700 (PDT) Received: from gizo.domain (97-115-119-26.ptld.qwest.net. [97.115.119.26]) by smtp.gmail.com with ESMTPSA id z25sm212905pfn.7.2019.10.08.16.51.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Oct 2019 16:51:15 -0700 (PDT) From: Greg Rose To: dev@openvswitch.org Date: Tue, 8 Oct 2019 16:51:11 -0700 Message-Id: <1570578672-28261-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 Cc: Roopa Prabhu Subject: [ovs-dev] [PATCH 1/2] compat: Backport IP_TUNNEL_INFO_BRIDGE 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 From: Roopa Prabhu Upstream commit: commit f35581d64e55fc65753a62957b3b98127d560d07 Author: Roopa Prabhu Date: Tue Jan 31 22:59:51 2017 -0800 ip_tunnels: new IP_TUNNEL_INFO_BRIDGE flag for ip_tunnel_info mode New ip_tunnel_info flag to represent bridged tunnel metadata. Used by bridge driver later in the series to pass per vlan dst metadata to bridge ports. Signed-off-by: Roopa Prabhu Signed-off-by: David S. Miller Cc: Roopa Prabhu Signed-off-by: Greg Rose --- datapath/linux/compat/include/net/ip_tunnels.h | 1 + 1 file changed, 1 insertion(+) diff --git a/datapath/linux/compat/include/net/ip_tunnels.h b/datapath/linux/compat/include/net/ip_tunnels.h index da64a94..e70c54a 100644 --- a/datapath/linux/compat/include/net/ip_tunnels.h +++ b/datapath/linux/compat/include/net/ip_tunnels.h @@ -165,6 +165,7 @@ struct ip_tunnel_key { /* Flags for ip_tunnel_info mode. */ #define IP_TUNNEL_INFO_TX 0x01 /* represents tx tunnel parameters */ #define IP_TUNNEL_INFO_IPV6 0x02 /* key contains IPv6 addresses */ +#define IP_TUNNEL_INFO_BRIDGE 0x04 /* represents a bridged tunnel id */ struct ip_tunnel_info { struct ip_tunnel_key key;