| Message ID | 20201112231039.1973-2-gvrose8192@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | Fix RHEL 7.7 build | expand |
On Thu, Nov 12, 2020 at 3:10 PM Greg Rose <gvrose8192@gmail.com> wrote: > > Remove stale and unused code left over after support for kernels > older than 3.10 was removed. > > Fixes: 8063e0958780 ("datapath: Drop support for kernel older than 3.10") > Signed-off-by: Greg Rose <gvrose8192@gmail.com> > > --- > V2 Separate out stale code removal to it's own patch as per suggestion > from Yi-Hung > --- Looks good to me. Thanks. Acked-by: Yi-Hung Wei <yihung.wei@gmail.com>
On 11/13/20 8:23 PM, Yi-Hung Wei wrote: > On Thu, Nov 12, 2020 at 3:10 PM Greg Rose <gvrose8192@gmail.com> wrote: >> >> Remove stale and unused code left over after support for kernels >> older than 3.10 was removed. >> >> Fixes: 8063e0958780 ("datapath: Drop support for kernel older than 3.10") >> Signed-off-by: Greg Rose <gvrose8192@gmail.com> >> >> --- >> V2 Separate out stale code removal to it's own patch as per suggestion >> from Yi-Hung >> --- > Looks good to me. Thanks. > > Acked-by: Yi-Hung Wei <yihung.wei@gmail.com> Thanks! Applied to master and backported down to 2.6. Best regards, Ilya Maximets.
diff --git a/acinclude.m4 b/acinclude.m4 index 1460289ca..9c2236f9e 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -975,8 +975,6 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ OVS_GREP_IFELSE([$KSRC/include/net/sock.h], [sk_no_check_tx]) OVS_GREP_IFELSE([$KSRC/include/linux/udp.h], [no_check6_tx]) - OVS_GREP_IFELSE([$KSRC/include/linux/utsrelease.h], [el6], - [OVS_DEFINE([HAVE_RHEL6_PER_CPU])]) OVS_FIND_PARAM_IFELSE([$KSRC/include/net/protocol.h], [udp_add_offload], [net], [OVS_DEFINE([HAVE_UDP_ADD_OFFLOAD_TAKES_NET])]) diff --git a/datapath/linux/compat/include/linux/percpu.h b/datapath/linux/compat/include/linux/percpu.h index 7c346aa31..a039142e2 100644 --- a/datapath/linux/compat/include/linux/percpu.h +++ b/datapath/linux/compat/include/linux/percpu.h @@ -7,12 +7,6 @@ #define this_cpu_ptr(ptr) per_cpu_ptr(ptr, smp_processor_id()) #endif -#ifdef HAVE_RHEL6_PER_CPU -#undef this_cpu_read -#undef this_cpu_inc -#undef this_cpu_dec -#endif - #if !defined this_cpu_read #define this_cpu_read(ptr) percpu_read(ptr) #endif diff --git a/datapath/linux/compat/include/linux/skbuff.h b/datapath/linux/compat/include/linux/skbuff.h index 204ce5497..bc73255d5 100644 --- a/datapath/linux/compat/include/linux/skbuff.h +++ b/datapath/linux/compat/include/linux/skbuff.h @@ -278,7 +278,7 @@ static inline void skb_clear_hash(struct sk_buff *skb) #ifdef HAVE_RXHASH skb->rxhash = 0; #endif -#if defined(HAVE_L4_RXHASH) && !defined(HAVE_RHEL_OVS_HOOK) +#if defined(HAVE_L4_RXHASH) skb->l4_rxhash = 0; #endif }
Remove stale and unused code left over after support for kernels older than 3.10 was removed. Fixes: 8063e0958780 ("datapath: Drop support for kernel older than 3.10") Signed-off-by: Greg Rose <gvrose8192@gmail.com> --- V2 Separate out stale code removal to it's own patch as per suggestion from Yi-Hung --- acinclude.m4 | 2 -- datapath/linux/compat/include/linux/percpu.h | 6 ------ datapath/linux/compat/include/linux/skbuff.h | 2 +- 3 files changed, 1 insertion(+), 9 deletions(-)