| Message ID | 1445379629-112880-1-git-send-email-jrajahalme@nicira.com |
|---|---|
| State | RFC, archived |
| Delegated to: | David Miller |
| Headers | show |
I missed the “net-next” label from the title, sorry for that. Jarno > On Oct 20, 2015, at 3:20 PM, Jarno Rajahalme <jrajahalme@nicira.com> 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@nicira.com> > --- > 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 > }; > > #define NF_CT_STATE_INVALID_BIT (1 << 0) > diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c > index ad61426..097ace4 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: > -- > 2.1.4 > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[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@nicira.com> > --- > 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. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
> On Oct 21, 2015, at 1:33 AM, Thomas Graf <tgraf@suug.ch> 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@nicira.com> >> --- >> 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 netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 10/21/15 at 01:15pm, Jarno Rajahalme wrote: > > > On Oct 21, 2015, at 1:33 AM, Thomas Graf <tgraf@suug.ch> wrote: > > 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? Given that at that point the changes become unrelated, I'd split it into separate patches, yes. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 }; #define NF_CT_STATE_INVALID_BIT (1 << 0) diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c index ad61426..097ace4 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:
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@nicira.com> --- include/uapi/linux/netfilter/nf_conntrack_common.h | 7 ++++--- net/openvswitch/conntrack.c | 2 -- 2 files changed, 4 insertions(+), 5 deletions(-)