From patchwork Sat Nov 7 00:06:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarno Rajahalme X-Patchwork-Id: 541180 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 6AF551402BF for ; Sat, 7 Nov 2015 11:06:52 +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=CGyHzXmq; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757807AbbKGAGT (ORCPT ); Fri, 6 Nov 2015 19:06:19 -0500 Received: from mail-pa0-f47.google.com ([209.85.220.47]:34580 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753367AbbKGAGR (ORCPT ); Fri, 6 Nov 2015 19:06:17 -0500 Received: by padhx2 with SMTP id hx2so128993615pad.1 for ; Fri, 06 Nov 2015 16:06:16 -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=Sqde2B7Llx10wrG0HcOQU05WPw0P231YQ0pHPw4DyG0=; b=CGyHzXmqA5MPmO6qYAirWOhGNjXztXQi24ZIJyp1qcgPqA6tJAU1roLmql0Ch6QjX9 aNNzPf2a5616eUXItN6SnqNeTJZn1RvktHswq4Cvg6QCAGXBvXZMbeZYKmwNJihlWPgB Oov0NipeDgu9jlse+QcJSSuLQqQ7409chOhCTDNk2bOlyrJ2Nh5wp8yZ2kBZHQhXzrb/ 52Cza+rxKZt5fAnjcnE+fzsqPAtsBvTyQ87jov+4ydyIXFkHipVgiVwLTP36YD8kqG0u OyS9fGPPPhLW3pgXQ1akyUrJNyjTsIZ6VtRgeOhZZ4GOyifqA1ZMzC6pHTSC+qTU1dFH IOVw== 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=Sqde2B7Llx10wrG0HcOQU05WPw0P231YQ0pHPw4DyG0=; b=HjDGmDecKeX/wQ4CeKu4+tIYz8CAm0/Q3vQNQuAb93D5OFnsNLt2JPiQG0uOjyFqck +ZeawiXEsBlqt8G+QwyTeB4J/Kk60VdFF5VeK9mfOVY2OYokOCMLT+W7r4CpUxAD9yH4 HiDQ0gp/gT1kgaIMRCthvuxg2E18L1ydz1cP1Tp+Mk8WRztBsutNP/eAGteI84I9YRZN UNA2DxltRv7uxvxhSsqp1BoUBrkq/ScgCjPVqgmM4yW5boMtRxAFNP8n3N/0b3pdHA4R +o1hLtkoDM7IULwE4IvI2eq/ua3FcGXkrlSFBwGurIkfkdYHO7DdhIryMgb/hUTXsgAW Se0A== X-Gm-Message-State: ALoCoQk9+wHggzvkhaiI7KfgCnYgJ06xXa9sPc2Yc8nJ59lVfjNcpxBjGjPCXcHYmsztPZDEU/sC X-Received: by 10.66.236.201 with SMTP id uw9mr21386900pac.76.1446854776542; Fri, 06 Nov 2015 16:06:16 -0800 (PST) Received: from sc9-mailhost3.vmware.com ([208.91.1.34]) by smtp.gmail.com with ESMTPSA id l16sm2160090pbq.22.2015.11.06.16.06.15 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 06 Nov 2015 16:06:16 -0800 (PST) From: Jarno Rajahalme To: netdev@vger.kernel.org Cc: netfilter-devel@vger.kernel.org, dev@openvswitch.org, jrajahalme@nicira.com Subject: [RFC PATCH net-next v2 1/8] netfilter: Remove IP_CT_NEW_REPLY definition. Date: Fri, 6 Nov 2015 16:06:01 -0800 Message-Id: <1446854768-38299-2-git-send-email-jrajahalme@nicira.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1446854768-38299-1-git-send-email-jrajahalme@nicira.com> References: <1446854768-38299-1-git-send-email-jrajahalme@nicira.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Remove the definition of IP_CT_NEW_REPLY from the kernel as it does not make sense. This allows the definition of IP_CT_NUMBER to be simplified as well. Signed-off-by: Jarno Rajahalme --- include/uapi/linux/netfilter/nf_conntrack_common.h | 12 +++++++++--- net/openvswitch/conntrack.c | 2 -- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/include/uapi/linux/netfilter/nf_conntrack_common.h b/include/uapi/linux/netfilter/nf_conntrack_common.h index 319f471..2f067cf 100644 --- a/include/uapi/linux/netfilter/nf_conntrack_common.h +++ b/include/uapi/linux/netfilter/nf_conntrack_common.h @@ -20,9 +20,15 @@ enum ip_conntrack_info { IP_CT_ESTABLISHED_REPLY = IP_CT_ESTABLISHED + IP_CT_IS_REPLY, IP_CT_RELATED_REPLY = IP_CT_RELATED + IP_CT_IS_REPLY, - IP_CT_NEW_REPLY = IP_CT_NEW + IP_CT_IS_REPLY, - /* Number of distinct IP_CT types (no NEW in reply dirn). */ - IP_CT_NUMBER = IP_CT_IS_REPLY * 2 - 1 + /* No NEW in reply direction. */ + + /* Number of distinct IP_CT types. */ + IP_CT_NUMBER + + /* only for userspace compatibility */ +#ifndef __KERNEL__ + IP_CT_NEW_REPLY = IP_CT_NUMBER; +#endif }; #define NF_CT_STATE_INVALID_BIT (1 << 0) diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c index c2cc111..a28a819 100644 --- a/net/openvswitch/conntrack.c +++ b/net/openvswitch/conntrack.c @@ -73,7 +73,6 @@ static u8 ovs_ct_get_state(enum ip_conntrack_info ctinfo) switch (ctinfo) { case IP_CT_ESTABLISHED_REPLY: case IP_CT_RELATED_REPLY: - case IP_CT_NEW_REPLY: ct_state |= OVS_CS_F_REPLY_DIR; break; default: @@ -90,7 +89,6 @@ static u8 ovs_ct_get_state(enum ip_conntrack_info ctinfo) ct_state |= OVS_CS_F_RELATED; break; case IP_CT_NEW: - case IP_CT_NEW_REPLY: ct_state |= OVS_CS_F_NEW; break; default: