From patchwork Sat Oct 10 04:15:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Pfaff X-Patchwork-Id: 528525 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (li376-54.members.linode.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 82AEC140E3D for ; Sat, 10 Oct 2015 15:16:26 +1100 (AEDT) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 4904C10B0C; Fri, 9 Oct 2015 21:16:01 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx3v1.cudamail.com (mx3.cudamail.com [64.34.241.5]) by archives.nicira.com (Postfix) with ESMTPS id E825010B03 for ; Fri, 9 Oct 2015 21:15:58 -0700 (PDT) Received: from bar4.cudamail.com (bar2 [192.168.15.2]) by mx3v1.cudamail.com (Postfix) with ESMTP id 75B74619817 for ; Fri, 9 Oct 2015 22:15:58 -0600 (MDT) X-ASG-Debug-ID: 1444450558-03dc213abb8e770001-byXFYA Received: from mx3-pf3.cudamail.com ([192.168.14.3]) by bar4.cudamail.com with ESMTP id BPnCNW56U59PLWfy (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 09 Oct 2015 22:15:58 -0600 (MDT) X-Barracuda-Envelope-From: blp@nicira.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.14.3 Received: from unknown (HELO mail-pa0-f54.google.com) (209.85.220.54) by mx3-pf3.cudamail.com with ESMTPS (RC4-SHA encrypted); 10 Oct 2015 04:15:57 -0000 Received-SPF: unknown (mx3-pf3.cudamail.com: Multiple SPF records returned) X-Barracuda-RBL-Trusted-Forwarder: 209.85.220.54 Received: by pablk4 with SMTP id lk4so103945623pab.3 for ; Fri, 09 Oct 2015 21:15:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=sPTwr+U8wdJtMN4apVgFJ5SJyVD4eiqVKm0Lpkoxkus=; b=C7YLd9Ekonry+Tfdowa4DoVBRcWp69G9rKHVpS4sQKih2ILriTCFddavqINz7eeQ/y bfsllZW0pSE9lllVMbkhoTuQSThxTTYmuHBMiteO0MKHe6BxfZVtzbmP2SKARiYHYdWe MHFc2G0sDe3SHQvmFcaAK7+h1i8w3o2kgdIHEE+awgqUFqsANC645QM/lRAN5IYKWUG1 44eZexgNwTjd4Z4MOHx2AtmHwzPbMaS0owkfCNMRP/u6Sw9O898DwGZdRgRwz8f4tfcL tTxqx0IBs+xsjW0hJ0m/9R7ZAMq0vi68MgeN2cJLCNHyzOwkYYqeNqdz96ruJSpLtRN+ i6/Q== X-Gm-Message-State: ALoCoQnbdYcH6h9YYmbwu3bpNEaURLw2ThIMTKFP2B0XC14p9viAGbKiFJfv7PW/rAgxaVeaJjd6 X-Received: by 10.68.174.193 with SMTP id bu1mr19431839pbc.136.1444450557480; Fri, 09 Oct 2015 21:15:57 -0700 (PDT) Received: from sigabrt.gateway.sonic.net (173-228-112-112.dsl.dynamic.fusionbroadband.com. [173.228.112.112]) by smtp.gmail.com with ESMTPSA id bk8sm5386937pad.18.2015.10.09.21.15.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 09 Oct 2015 21:15:56 -0700 (PDT) X-CudaMail-Envelope-Sender: blp@nicira.com X-Barracuda-Apparent-Source-IP: 173.228.112.112 From: Ben Pfaff To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-V3-1008077228 X-CudaMail-DTE: 100915 X-CudaMail-Originating-IP: 209.85.220.54 Date: Fri, 9 Oct 2015 21:15:26 -0700 X-ASG-Orig-Subj: [##CM-V3-1008077228##][PATCH 05/23] nx-match: Serialize match on IP TTL even when outputting OXM. Message-Id: <1444450544-11845-6-git-send-email-blp@nicira.com> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1444450544-11845-1-git-send-email-blp@nicira.com> References: <1444450544-11845-1-git-send-email-blp@nicira.com> X-Barracuda-Connect: UNKNOWN[192.168.14.3] X-Barracuda-Start-Time: 1444450558 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 Cc: Ben Pfaff Subject: [ovs-dev] [PATCH 05/23] nx-match: Serialize match on IP TTL even when outputting OXM. X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" The 'oxm' parameter to nxm_put_ip() indicates whether NXM or OXM code points should be used in cases where both exist. It shouldn't cause matches to be dropped entirely, since that changes the meaning, but that's what was done here for matches on the IP (v4 or v6) TTL. This commit fixes the problem. Signed-off-by: Ben Pfaff Acked-by: Justin Pettit --- lib/nx-match.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/nx-match.c b/lib/nx-match.c index eef2c54..90636bc 100644 --- a/lib/nx-match.c +++ b/lib/nx-match.c @@ -817,7 +817,7 @@ nxm_put_ip(struct ofpbuf *b, const struct match *match, enum ofp_version oxm) flow->nw_tos & IP_ECN_MASK); } - if (!oxm && match->wc.masks.nw_ttl) { + if (match->wc.masks.nw_ttl) { nxm_put_8(b, MFF_IP_TTL, oxm, flow->nw_ttl); }