From patchwork Sat Nov 7 00:10:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarno Rajahalme X-Patchwork-Id: 541196 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 B1CDD1402D5 for ; Sat, 7 Nov 2015 11:11:46 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=nicira_com.20150623.gappssmtp.com header.i=@nicira_com.20150623.gappssmtp.com header.b=iov1yFXw; dkim-atps=neutral Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 9B76210A0B; Fri, 6 Nov 2015 16:11:12 -0800 (PST) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx3v3.cudamail.com (mx3.cudamail.com [64.34.241.5]) by archives.nicira.com (Postfix) with ESMTPS id 71794109F8 for ; Fri, 6 Nov 2015 16:11:10 -0800 (PST) Received: from bar4.cudamail.com (localhost [127.0.0.1]) by mx3v3.cudamail.com (Postfix) with ESMTPS id EDA4D162CCB for ; Fri, 6 Nov 2015 17:11:09 -0700 (MST) X-ASG-Debug-ID: 1446855069-03dc2117b614810001-byXFYA Received: from mx3-pf3.cudamail.com ([192.168.14.3]) by bar4.cudamail.com with ESMTP id n0ZLZSaCHNCgZGN1 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 06 Nov 2015 17:11:09 -0700 (MST) X-Barracuda-Envelope-From: jrajahalme@nicira.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.14.3 Received: from unknown (HELO mail-pa0-f46.google.com) (209.85.220.46) by mx3-pf3.cudamail.com with ESMTPS (RC4-SHA encrypted); 7 Nov 2015 00:21:33 -0000 Received-SPF: unknown (mx3-pf3.cudamail.com: Multiple SPF records returned) X-Barracuda-Apparent-Source-IP: 209.85.220.46 X-Barracuda-RBL-IP: 209.85.220.46 Received: by pasz6 with SMTP id z6so141464922pas.2 for ; Fri, 06 Nov 2015 16:11:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nicira_com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=uVz36z2cf3h2j3cQ2ZiAyFAKS/GC1AgqzSAoOuiLkcw=; b=iov1yFXwdwxqX/BDz/m6npaZSrYsGBy9/QTCOYJj7WrFPqn2DLXOit974iZQVwy4/7 GRbuZJD/BdNjqfT4Wx///KVIDnaP+YBEV6m7TiPrgFUr5EZ6MPS4bfETOrqLi/9OEnhR 4wQuht/Ot1ls4c4fzB21OeffHchQB8zJEyoj5VMqIuhQVBpSj7+nLRuZwzyd58QBKmeH cZxjMvwJpCaFBEyPchWAruTxMvatP240/fuY0H5O4dC1kxv8DpWXWZl67Gra55aUV4cm RrtFn3bJIst2kGN8CvsOTejyOG26nlZeRNgBmIH9pP28unBb4zHRRn/ritivOu+UKQUO Yj+g== 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=uVz36z2cf3h2j3cQ2ZiAyFAKS/GC1AgqzSAoOuiLkcw=; b=Gf4L9r61SJmNQG/6F2JvQ2BtQju93ifU6VRPDzHrXuhXScjFsLkcZpXDo40wm/869I pXvQ+WEPhSCTNJHaH03Uo2xgOrlyFwcpt74/2QVBooPhfe2tSS+hWbf9tRCqTbfiQOfC rNsIsU1opgeag/t6+Lxz4f4EaHjPXky0I5bMPVawIEcR9Guj1KJ7lrFuEgSH4RorF2Pf 69gApYb4rwzIQLPOQXIaPVAorBJlJgXYJgj5F3XQuIMvxTC9TU6BlmrWlQi7RJJT8EMg B7p8tSR7vgnKRNLTQnR+hT/pNHZpHhQvZ2AF4J8k/Eo4M066qnO9AMXMXWS/B8hvTKfs NSZg== X-Gm-Message-State: ALoCoQlcGM52wHVpqdiWp+rXtQhDtbfaCbajdMMlxFPdGQJwNALURLrUp2h84xW74G8lubCKcth9 X-Received: by 10.69.25.40 with SMTP id in8mr15172153pbd.96.1446855068954; Fri, 06 Nov 2015 16:11:08 -0800 (PST) Received: from sc9-mailhost1.vmware.com ([208.91.1.34]) by smtp.gmail.com with ESMTPSA id kj3sm2137013pbc.59.2015.11.06.16.11.08 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 06 Nov 2015 16:11:08 -0800 (PST) X-CudaMail-Envelope-Sender: jrajahalme@nicira.com From: Jarno Rajahalme To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-V3-1105062491 X-CudaMail-DTE: 110615 X-CudaMail-Originating-IP: 209.85.220.46 Date: Fri, 6 Nov 2015 16:10:54 -0800 X-ASG-Orig-Subj: [##CM-V3-1105062491##][PATCH v2 7/8] packets: Reorder CS_* flags to remove gap. Message-Id: <1446855055-38378-8-git-send-email-jrajahalme@nicira.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1446855055-38378-1-git-send-email-jrajahalme@nicira.com> References: <1446855055-38378-1-git-send-email-jrajahalme@nicira.com> X-Barracuda-Connect: UNKNOWN[192.168.14.3] X-Barracuda-Start-Time: 1446855069 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 Subject: [ovs-dev] [PATCH v2 7/8] packets: Reorder CS_* flags to remove gap. 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" This changes the conntrack state flags used in the OpenFlow interface to match the ones we currently use in the datapath. While these do not need to be synced, it is nice to get rid of the gap. This should be merged before the first OVS release with connection tracking, or not at all. Signed-off-by: Jarno Rajahalme Acked-by: Ben Pfaff --- lib/packets.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/packets.h b/lib/packets.h index 67f635e..f50f42f 100644 --- a/lib/packets.h +++ b/lib/packets.h @@ -722,9 +722,9 @@ BUILD_ASSERT_DECL(TCP_HEADER_LEN == sizeof(struct tcp_header)); #define CS_NEW 0x01 #define CS_ESTABLISHED 0x02 #define CS_RELATED 0x04 -#define CS_INVALID 0x20 -#define CS_REPLY_DIR 0x40 -#define CS_TRACKED 0x80 +#define CS_REPLY_DIR 0x08 +#define CS_INVALID 0x10 +#define CS_TRACKED 0x20 /* Undefined connection state bits. */ #define CS_SUPPORTED_MASK (CS_NEW | CS_ESTABLISHED | CS_RELATED \