Message ID | 1526591733-4450-9-git-send-email-gvrose8192@gmail.com |
---|---|
State | Superseded |
Headers | show
Return-Path: <ovs-dev-bounces@openvswitch.org> 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=<UNKNOWN>) 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="Axws3NeV"; 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 40n41Q26cWz9s33 for <incoming@patchwork.ozlabs.org>; Fri, 18 May 2018 07:19:06 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 1AAA0E92; Thu, 17 May 2018 21:15:54 +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 D01F9E41 for <dev@openvswitch.org>; Thu, 17 May 2018 21:15:45 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pl0-f66.google.com (mail-pl0-f66.google.com [209.85.160.66]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 92ED06D2 for <dev@openvswitch.org>; Thu, 17 May 2018 21:15:45 +0000 (UTC) Received: by mail-pl0-f66.google.com with SMTP id c11-v6so3276557plr.5 for <dev@openvswitch.org>; Thu, 17 May 2018 14:15:45 -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=DAP8s1FTQPQd2Sl1OV9NRPCXD6MxrYhzc5r6pMbggc8=; b=Axws3NeV9AA2QNwFh3OdTmyfE6fJUtvOr0C3hXTVLUhCboLKQRF2fD2c7ESiqjMAd+ K8CMkg/onjznBgMuWEJWy5bjKEGL1z5iWwMQE1LqIfmbrLUTkY6SFmXs9LC3BYT3v0HG VKJNBfyYCUbFl+K4s+Dczz/XpO+QrNtM77gqRuZueXUUa/H87f6bPPk+qCzkOnGmEYC6 D5fbdVF9f8RCYOoBzMLdXavLtB7azYLRX4CtqCYOO5ekU5wiVgaZm24wbg5a2NewTCgn YkpvDPCzaGNv5DhiYcVUv8jcLuYOrDb9AqEyIcOdR5RQBhyyu9xY/lYXP2JtrxVJbZhP OAdg== 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=DAP8s1FTQPQd2Sl1OV9NRPCXD6MxrYhzc5r6pMbggc8=; b=ShtwHWxlutjtkirkaEVeUBdhcE7wz0uRIpKwr6/Gj6yCkgZP1nEINhBQe5+LdUBf78 dfeQYDD5LXBxStiftQMxkXbShvExoFYPvHht/i3gdo9haTSjCnCQUx1VF4LgiVxBdSHj sEbD+D31WupsfvaqoUTfvh5Afa49GCltWtItQJZc8+bmlFdLLkd8UJQ5bOKCCTnNii1N OXk4tkzSxesahnzvxFcOBjnB4kgizH6uy7sooZufPl4B8qmQ3Un73y0/4IkXWUWptg9x OSZpSMJ0DcfZQ/N9zg2yFS8Qyxh4nwfAz39WIfuYw8UnSp6PFUbWS/WlVnMLx1nlW6ta 3zcw== X-Gm-Message-State: ALKqPwey5TltAz8/hqPTj4uJBAPWEP85VR+Sggood9uMcC61LkH+zo6C jSYStgPqbGCr7m0a5LUZKD7DEQ== X-Google-Smtp-Source: AB8JxZobcq2hmhWW0FJDLYXXhEevUJ2PxnBaY6C1Bt4stOpi4x4kQehNbhdHJkCrX8ns/oJnHnDaBg== X-Received: by 2002:a17:902:6a85:: with SMTP id n5-v6mr6663392plk.288.1526591744956; Thu, 17 May 2018 14:15:44 -0700 (PDT) Received: from gizo.domain (97-115-125-157.ptld.qwest.net. [97.115.125.157]) by smtp.gmail.com with ESMTPSA id r68-v6sm12410581pfi.174.2018.05.17.14.15.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 May 2018 14:15:44 -0700 (PDT) From: Greg Rose <gvrose8192@gmail.com> To: dev@openvswitch.org Date: Thu, 17 May 2018 14:15:00 -0700 Message-Id: <1526591733-4450-9-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1526591733-4450-1-git-send-email-gvrose8192@gmail.com> References: <1526591733-4450-1-git-send-email-gvrose8192@gmail.com> 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: Xin Long <lucien.xin@gmail.com> Subject: [ovs-dev] [PATCH 08/41] ip_gre: set tunnel hlen properly in erspan_tunnel_init X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: <ovs-dev.openvswitch.org> List-Unsubscribe: <https://mail.openvswitch.org/mailman/options/ovs-dev>, <mailto:ovs-dev-request@openvswitch.org?subject=unsubscribe> List-Archive: <http://mail.openvswitch.org/pipermail/ovs-dev/> List-Post: <mailto:ovs-dev@openvswitch.org> List-Help: <mailto:ovs-dev-request@openvswitch.org?subject=help> List-Subscribe: <https://mail.openvswitch.org/mailman/listinfo/ovs-dev>, <mailto:ovs-dev-request@openvswitch.org?subject=subscribe> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org |
Series |
Add ERSPAN support
|
expand
|
diff --git a/datapath/linux/compat/ip_gre.c b/datapath/linux/compat/ip_gre.c index 1a8dc76..70c6a9f 100644 --- a/datapath/linux/compat/ip_gre.c +++ b/datapath/linux/compat/ip_gre.c @@ -1044,7 +1044,9 @@ static int erspan_tunnel_init(struct net_device *dev) tunnel->tun_hlen = 8; tunnel->parms.iph.protocol = IPPROTO_GRE; - t_hlen = tunnel->hlen + sizeof(struct iphdr) + sizeof(struct erspanhdr); + tunnel->hlen = tunnel->tun_hlen + tunnel->encap_hlen + + sizeof(struct erspanhdr); + t_hlen = tunnel->hlen + sizeof(struct iphdr); dev->needed_headroom = LL_MAX_HEADER + t_hlen + 4; dev->mtu = ETH_DATA_LEN - t_hlen - 4;