[ovs-dev] netlink-conntrack: undef the correct macro
diff mbox series

Message ID 20180723204049.13465-1-aconole@redhat.com
State Accepted
Headers show
Series
  • [ovs-dev] netlink-conntrack: undef the correct macro
Related show

Commit Message

Aaron Conole July 23, 2018, 8:40 p.m. UTC
Fixes: 6830a0c0e6bf ("netlink-conntrack: New module.")
Cc: Daniele Di Proietto <daniele.di.proietto@gmail.com>
Signed-off-by: Aaron Conole <aconole@redhat.com>
---
 lib/netlink-conntrack.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Yi-Hung Wei July 23, 2018, 10:14 p.m. UTC | #1
On Mon, Jul 23, 2018 at 1:40 PM, Aaron Conole <aconole@redhat.com> wrote:
> Fixes: 6830a0c0e6bf ("netlink-conntrack: New module.")
> Cc: Daniele Di Proietto <daniele.di.proietto@gmail.com>
> Signed-off-by: Aaron Conole <aconole@redhat.com>
> ---
>  lib/netlink-conntrack.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lib/netlink-conntrack.c b/lib/netlink-conntrack.c
> index e5a5fc118..42be1d9ce 100644
> --- a/lib/netlink-conntrack.c
> +++ b/lib/netlink-conntrack.c
> @@ -660,7 +660,7 @@ ip_ct_tcp_flags_to_dpif(uint8_t flags)
>  #define CT_DPIF_TCP_FLAG(FLAG) \
>          ret |= (flags & IP_CT_TCP_FLAG_##FLAG) ? CT_DPIF_TCPF_##FLAG : 0;
>      CT_DPIF_TCP_FLAGS
> -#undef CT_DPIF_STATUS_FLAG
> +#undef CT_DPIF_TCP_FLAG
>      return ret;
>  #endif
>  }
> --
Thanks for the fix.

Acked-by: Yi-Hung Wei <yihung.wei@gmail.com>
Ben Pfaff July 24, 2018, 11:48 p.m. UTC | #2
On Mon, Jul 23, 2018 at 04:40:49PM -0400, Aaron Conole wrote:
> Fixes: 6830a0c0e6bf ("netlink-conntrack: New module.")
> Cc: Daniele Di Proietto <daniele.di.proietto@gmail.com>
> Signed-off-by: Aaron Conole <aconole@redhat.com>

Thanks, applied to master.

I didn't backport because I don't think there's any real harm here.
Aaron Conole July 25, 2018, 11:30 a.m. UTC | #3
Ben Pfaff <blp@ovn.org> writes:

> On Mon, Jul 23, 2018 at 04:40:49PM -0400, Aaron Conole wrote:
>> Fixes: 6830a0c0e6bf ("netlink-conntrack: New module.")
>> Cc: Daniele Di Proietto <daniele.di.proietto@gmail.com>
>> Signed-off-by: Aaron Conole <aconole@redhat.com>
>
> Thanks, applied to master.
>
> I didn't backport because I don't think there's any real harm here.

Agreed.

Patch
diff mbox series

diff --git a/lib/netlink-conntrack.c b/lib/netlink-conntrack.c
index e5a5fc118..42be1d9ce 100644
--- a/lib/netlink-conntrack.c
+++ b/lib/netlink-conntrack.c
@@ -660,7 +660,7 @@  ip_ct_tcp_flags_to_dpif(uint8_t flags)
 #define CT_DPIF_TCP_FLAG(FLAG) \
         ret |= (flags & IP_CT_TCP_FLAG_##FLAG) ? CT_DPIF_TCPF_##FLAG : 0;
     CT_DPIF_TCP_FLAGS
-#undef CT_DPIF_STATUS_FLAG
+#undef CT_DPIF_TCP_FLAG
     return ret;
 #endif
 }