On 11/13/20 8:24 PM, Yi-Hung Wei wrote:
> On Thu, Nov 12, 2020 at 3:10 PM Greg Rose <gvrose8...@gmail.com> wrote:
>>
>> RHEL 7.2 introduced a KABI fixup in struct sk_buff for the name
>> change of l4_rxhash to l4_hash. Then patch
>> 9ba57fc7cccc ("datapath: Add hash info to upcall") introduced a
>> compile error by using l4_hash and not fixing up the HAVE_L4_RXHASH
>> configuration flag.
>>
>> Remove all references to HAVE_L4_RXHASH and always use l4_hash to
>> resolve the issue. This will break compilation on RHEL 7.0 and
>> RHEL 7.1 but dropping support for these older kernels shouldn't be
>> a problem.
>>
>> Fixes: 9ba57fc7cccc ("datapath: Add hash info to upcall")
>> Signed-off-by: Greg Rose <gvrose8...@gmail.com>
>>
>> ---
>> V2 - Just removes l4_rxhash and ends support for RHEL 7.x < 7.2
>> ---
> Thanks for v2. Looks good to me.
>
> Acked-by: Yi-Hung Wei <yihung....@gmail.com>
>
>> diff --git a/datapath/linux/compat/include/linux/skbuff.h
>> b/datapath/linux/compat/include/linux/skbuff.h
>> index bc73255d5..d3bc6c715 100644
>> --- a/datapath/linux/compat/include/linux/skbuff.h
>> +++ b/datapath/linux/compat/include/linux/skbuff.h
>> @@ -278,9 +278,7 @@ static inline void skb_clear_hash(struct sk_buff *skb)
>> #ifdef HAVE_RXHASH
>> skb->rxhash = 0;
>> #endif
>> -#if defined(HAVE_L4_RXHASH)
>> - skb->l4_rxhash = 0;
>> -#endif
>> + skb->l4_hash = 0;
>
> There is a space before the tab in this line. When the maintainer
> commits this patch, please help to remove the space.
Thanks!
I fixed that.
Applied to master and backported down to 2.14.
Best regards, Ilya Maximets.
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
