| Message ID | 1446855055-38378-8-git-send-email-jrajahalme@nicira.com |
|---|---|
| State | Superseded |
| Headers | show |
On Fri, Nov 06, 2015 at 04:10:54PM -0800, Jarno Rajahalme wrote: > 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 <jrajahalme@nicira.com> Acked-by: Ben Pfaff <blp@ovn.org>
> On Nov 24, 2015, at 10:40 AM, Ben Pfaff <blp@ovn.org> wrote: > > On Fri, Nov 06, 2015 at 04:10:54PM -0800, Jarno Rajahalme wrote: >> 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 <jrajahalme@nicira.com> > > Acked-by: Ben Pfaff <blp@ovn.org> Pushed to master, Jarno
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 \
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 <jrajahalme@nicira.com> --- lib/packets.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)