From patchwork Fri Mar 9 21:02:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 883999 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="UiL1dC4Z"; 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 3zyfy41P9Sz9sYg for ; Sat, 10 Mar 2018 08:04:11 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id AD6CB11F2; Fri, 9 Mar 2018 21:02:55 +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 2C2CF1198 for ; Fri, 9 Mar 2018 21:02:52 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id E45F4620 for ; Fri, 9 Mar 2018 21:02:51 +0000 (UTC) Received: by mail-pf0-f194.google.com with SMTP id 17so1764417pfw.11 for ; Fri, 09 Mar 2018 13:02:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=MXaDBviixJUeELVDFfR+MXVR2A1fch3wGLjHw5aY/xM=; b=UiL1dC4ZsK7dXJSBckN9QOuXNvBm27mqzTe4ZCIJG6RfkR76whOWP1l433X0TxC9y4 MTcSRPX1ykM5cdZZFIfXNpWpCNpLjgsYPYiR5bjP1ZzvE3heoK/gjWBOSCyLsnJCIQMY Eqalo9NYWwioo6sJXX+m4D542bviKh35Zrkh+/nBZl8gjTS4FFXnr7hOA5Z/FHqkV5zc nPtEZEsSyI+aDf7v2Tyd7OwOBZjKhhWfpqqpLawa0ORKLERDtqVVh1NZHKi+GXcHqlA5 nheiaQy1WIwlHKGrarBuncDHpuC0pBX9NMik1E3EvezXGwZMl8yim0hilCdaRXja+AxY 6sXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=MXaDBviixJUeELVDFfR+MXVR2A1fch3wGLjHw5aY/xM=; b=Nr3Jm8Va2VlRDMVYCgnuyHgagkq/wBG1rWQpC/u0nt7KKFc6xSu/ugAHVWScoGNQVB O6GHtlrbm05i9sWznX/wLJAhvZG28fpwZfL9fq1l9kscrJ66WDI0qxi1oWyKMvWDQ1xp PoSOwv3fK3A+SS7SWhy8j7avn3QgRkjepZ1IlEMWQ3szWTCUsYtlb6PgHtX/14lo0TiO p7KyCfnobFyvL9+ve4BgeeMjtZB78sq3WL0DmPpP5CVenLShb3x68FD9JlY7uLaWzv6q XXnAw4/s9JqrBkDG6wX5DHYVLPUreKcbzhlMt06wPOSBT9tynjhgZoYRpl4GhKHXdyNi xUzw== X-Gm-Message-State: AElRT7EhBSr5p+0tdStdoXrCnSLIrTjBSBgPmCxXERaMhj+TdzYKD/zE G2dKRgEi6bUyBBtd1L2rTqUOyvOh X-Google-Smtp-Source: AG47ELtdDE1wTe4e89TlZFTtTk2qEwxGnwVpY9qqHOEI8uaM7TETN0FD5ddS9Yq/8pRgKgN8FmO/wg== X-Received: by 10.101.67.73 with SMTP id k9mr2868075pgq.244.1520629371365; Fri, 09 Mar 2018 13:02:51 -0800 (PST) Received: from sc9-mailhost2.vmware.com ([24.5.191.4]) by smtp.gmail.com with ESMTPSA id x4sm4679144pfb.46.2018.03.09.13.02.50 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 09 Mar 2018 13:02:50 -0800 (PST) From: William Tu To: dev@openvswitch.org Date: Fri, 9 Mar 2018 13:02:22 -0800 Message-Id: <1520629345-130136-3-git-send-email-u9012063@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1520629345-130136-1-git-send-email-u9012063@gmail.com> References: <1520629345-130136-1-git-send-email-u9012063@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 Subject: [ovs-dev] [PATCH 2/5] userspace: return correct ipv6 header len. 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 The ipv6 header len might have extension header, but current code simply returns fixed ipv6 header length 40-byte. Signed-off-by: William Tu --- lib/netdev-native-tnl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/netdev-native-tnl.c b/lib/netdev-native-tnl.c index fb5eab033758..c3e698d2e72b 100644 --- a/lib/netdev-native-tnl.c +++ b/lib/netdev-native-tnl.c @@ -123,7 +123,7 @@ netdev_tnl_ip_extract_tnl_md(struct dp_packet *packet, struct flow_tnl *tnl, tnl->ip_tos = ntohl(tc_flow) >> 20; tnl->ip_ttl = ip6->ip6_hlim; - *hlen += IPV6_HEADER_LEN; + *hlen += packet->l4_ofs - packet->l3_ofs; } else { VLOG_WARN_RL(&err_rl, "ipv4 packet has invalid version (%d)",