diff mbox series

[ovs-dev,V2,1/2] compat: Fix nf_ip_hook parameters for RHEL 8

Message ID 1585064523-18522-1-git-send-email-gvrose8192@gmail.com
State Accepted
Commit 7fb890db313cd3e4218a529c8e1226d4ea088ed5
Headers show
Series [ovs-dev,V2,1/2] compat: Fix nf_ip_hook parameters for RHEL 8 | expand

Commit Message

Gregory Rose March 24, 2020, 3:42 p.m. UTC 
From: Greg Rose <gvrose@VMware-box.domain>

A RHEL release version check was only checking for RHEL releases
greater than 7.0 so that ended up including a compat fixup that
is not needed for 8.0.  Fix up the version check.

Signed-off-by: Greg Rose <gvrose8192@gmail.com>
---
 datapath/linux/compat/stt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Yi-Hung Wei March 24, 2020, 4:31 p.m. UTC | #1 
On Tue, Mar 24, 2020 at 8:42 AM Greg Rose <gvrose8192@gmail.com> wrote:
>
> From: Greg Rose <gvrose@VMware-box.domain>
>
> A RHEL release version check was only checking for RHEL releases
> greater than 7.0 so that ended up including a compat fixup that
> is not needed for 8.0.  Fix up the version check.
>
> Signed-off-by: Greg Rose <gvrose8192@gmail.com>
> ---
LGTM.

Acked-by: Yi-Hung Wei <yihung.wei@gmail.com>
William Tu March 24, 2020, 7:09 p.m. UTC | #2 
On Tue, Mar 24, 2020 at 09:31:23AM -0700, Yi-Hung Wei wrote:
> On Tue, Mar 24, 2020 at 8:42 AM Greg Rose <gvrose8192@gmail.com> wrote:
> >
> > From: Greg Rose <gvrose@VMware-box.domain>
> >
> > A RHEL release version check was only checking for RHEL releases
> > greater than 7.0 so that ended up including a compat fixup that
> > is not needed for 8.0.  Fix up the version check.
> >
> > Signed-off-by: Greg Rose <gvrose8192@gmail.com>
> > ---
> LGTM.
> 
> Acked-by: Yi-Hung Wei <yihung.wei@gmail.com>
Applied to master, thanks
diff mbox series

Patch

diff --git a/datapath/linux/compat/stt.c b/datapath/linux/compat/stt.c
index 7b46d1a..8a5853f 100644
--- a/datapath/linux/compat/stt.c
+++ b/datapath/linux/compat/stt.c
@@ -1559,7 +1559,7 @@  static void clean_percpu(struct work_struct *work)
 #endif
 
 #ifdef HAVE_NF_HOOK_STATE
-#if RHEL_RELEASE_CODE > RHEL_RELEASE_VERSION(7,0)
+#if RHEL_RELEASE_CODE > RHEL_RELEASE_VERSION(7,0) && RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(8,0)
 /* RHEL nfhook hacks. */
 #ifndef __GENKSYMS__
 #define LAST_PARAM const struct net_device *in, const struct net_device *out, \