[ovs-dev] [PATCH] datapath: Check for backported sctp_compute_cksum().

[Jesse Gross]

Thanks for the review, I applied this.

On Fri, Jan 3, 2014 at 7:05 PM, Joe Stringer <joestringer at nicira.com> wrote:
> Looks good, thanks Jesse.
>
> Acked-by: Joe Stringer <joestringer at nicira.com>
>
> On 3 January 2014 15:44, Jesse Gross <jesse at nicira.com> wrote:
>> This is backported by RHEL7.
>>
>> Reported-by: Ashok Byahatti <ashok.byahatti at embrane.com>
>> Signed-off-by: Jesse Gross <jesse at nicira.com>
>> ---
>>  acinclude.m4                                      | 2 ++
>>  datapath/linux/compat/include/net/sctp/checksum.h | 3 +--
>>  2 files changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/acinclude.m4 b/acinclude.m4
>> index 7078654..8ff5828 100644
>> --- a/acinclude.m4
>> +++ b/acinclude.m4
>> @@ -281,6 +281,8 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [
>>    OVS_GREP_IFELSE([$KSRC/include/net/netlink.h], [nla_put_be64])
>>    OVS_GREP_IFELSE([$KSRC/include/net/netlink.h], [nla_find_nested])
>>
>> +  OVS_GREP_IFELSE([$KSRC/include/net/sctp/checksum.h], [sctp_compute_cksum])
>> +
>>    OVS_GREP_IFELSE([$KSRC/include/linux/if_vlan.h], [ADD_ALL_VLANS_CMD],
>>                    [OVS_DEFINE([HAVE_VLAN_BUG_WORKAROUND])])
>>
>> diff --git a/datapath/linux/compat/include/net/sctp/checksum.h b/datapath/linux/compat/include/net/sctp/checksum.h
>> index 59d209b..7832abc 100644
>> --- a/datapath/linux/compat/include/net/sctp/checksum.h
>> +++ b/datapath/linux/compat/include/net/sctp/checksum.h
>> @@ -1,10 +1,9 @@
>>  #ifndef __SCTP_CHECKSUM_WRAPPER_H
>>  #define __SCTP_CHECKSUM_WRAPPER_H 1
>>
>> -#include <linux/version.h>
>>  #include_next <net/sctp/checksum.h>
>>
>> -#if LINUX_VERSION_CODE < KERNEL_VERSION(3,12,0)
>> +#ifndef HAVE_SCTP_COMPUTE_CKSUM
>>  static inline __le32 sctp_compute_cksum(const struct sk_buff *skb,
>>                                         unsigned int offset)
>>  {
>> --
>> 1.8.3.2
>>
>> _______________________________________________
>> dev mailing list
>> dev at openvswitch.org
>> http://openvswitch.org/mailman/listinfo/dev