> On Oct 21, 2015, at 1:33 AM, Thomas Graf <tgraf@xxxxxxx> wrote: > > [Copying netfilter-devel] > > On 10/20/15 at 03:20pm, Jarno Rajahalme wrote: >> Remove the definition of IP_CT_NEW_REPLY as it does not make sense. >> This allows the definition of IP_CT_NUMBER to be simplified as well. >> >> Signed-off-by: Jarno Rajahalme <jrajahalme@xxxxxxxxxx> >> --- >> include/uapi/linux/netfilter/nf_conntrack_common.h | 7 ++++--- >> net/openvswitch/conntrack.c | 2 -- >> 2 files changed, 4 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..e0aebc8 100644 >> --- a/include/uapi/linux/netfilter/nf_conntrack_common.h >> +++ b/include/uapi/linux/netfilter/nf_conntrack_common.h >> @@ -20,9 +20,10 @@ 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 IP_CT_NEW_REPLY */ >> + >> + /* Number of distinct IP_CT types. */ >> + IP_CT_NUMBER >> }; > > I understand what you are doing here but this is part of the published > UAPI and removing this might break compilation of a user application > even if the definition is not used right now. It's probably safer to > leave the definition and obsolete it with a comment. OK. I should probably separate the netlink and openvswitch changes to separate patches as well? Jarno -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html