[ovs-dev] [LNG] Re: datapath: remove HAVE_MAC_RAW

[Viresh Kumar]

On 28 August 2013 05:37, Jesse Gross <jesse at nicira.com> wrote:
> On Tue, Aug 27, 2013 at 3:51 AM, Viresh Kumar <viresh.kumar at linaro.org> wrote:
>> On 26 August 2013 21:59, Jesse Gross <jesse at nicira.com> wrote:
>>
>>> This is compatibility code for older kernels so by definition it
>>> doesn't exist in current kernels. You can't just remove it.
>>
>> My mistake :(
>>
>> Will something like this makes sense? This was changed in 2.6.22 by
>> following patch:
>> b0e380b [SK_BUFF]: unions of just one member don't get anything done, kill them
>
> I suspect that this is just some unrelated key word that was added to
> skbuff.h for the RT kernels. I think the best solution would be to
> just tighten up the grep expression since that is simpler and clearer
> than adding version checks as well.

What about this?

diff --git a/acinclude.m4 b/acinclude.m4
index 73ee5ce..d55ab14 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -238,7 +238,7 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [
   # quoting rules.
   OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [[[^@]]proto_data_valid],
                   [OVS_DEFINE([HAVE_PROTO_DATA_VALID])])
-  OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [raw],
+  OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [\*raw\;],
                   [OVS_DEFINE([HAVE_MAC_RAW])])
   OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_dst(],
                   [OVS_DEFINE([HAVE_SKB_DST_ACCESSOR_FUNCS])])