From patchwork Thu Sep 12 10:11:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 19997 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f72.google.com (mail-yh0-f72.google.com [209.85.213.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 03BD325E64 for ; Thu, 12 Sep 2013 10:11:22 +0000 (UTC) Received: by mail-yh0-f72.google.com with SMTP id z20sf11636128yhz.3 for ; Thu, 12 Sep 2013 03:11:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=+115Cr4yOlfQt4WjdvAhWVEEXyxqqlR5cUcL6+FtjZM=; b=MZ57yd1u52E6ge+uCLE0rGbvqbHKc2v9GyALSui2NRV5VC7J2nSXPGy1EEwv8pFmVD +RN/ZUdZ5eubf3xOpIzQ1tn7gzLyI7pe0LZvV7ldNBjCbXcNde/0bchz9qusvIVjbjnx rb3XmXlNYOpIH9sEs5ckFvate9Nb4VxC/l+sakDP4vA7M7oNgrAOLPjAXefumpRV8eve GkX/6QHTwZPmg12+1fBk4jJHYEGCL8zZdH3AmH7R74FX8eAEmryDBFTsQriFfJPV2zU8 l9KJZ2KS9FFNGiX1BSpuVjR3gUW0nJ9LLWF2f1f2tcfdmbvOsXJLZKhjBPeX/ajGZqxX Teeg== X-Gm-Message-State: ALoCoQl3uu6yrgnrrGiSHPJbLtxsN2O5qyM8sI7e1rl0tecmCy6yht8JoL382ASIekV3qTSmTQ5x X-Received: by 10.236.93.45 with SMTP id k33mr2609507yhf.19.1378980682765; Thu, 12 Sep 2013 03:11:22 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.35.204 with SMTP id k12ls633222qej.25.gmail; Thu, 12 Sep 2013 03:11:22 -0700 (PDT) X-Received: by 10.58.137.167 with SMTP id qj7mr5845414veb.1.1378980682539; Thu, 12 Sep 2013 03:11:22 -0700 (PDT) Received: from mail-vb0-f52.google.com (mail-vb0-f52.google.com [209.85.212.52]) by mx.google.com with ESMTPS id ta3si954648vcb.71.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 12 Sep 2013 03:11:22 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.52 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.52; Received: by mail-vb0-f52.google.com with SMTP id f12so6869024vbg.25 for ; Thu, 12 Sep 2013 03:11:22 -0700 (PDT) X-Received: by 10.220.91.16 with SMTP id k16mr1083145vcm.21.1378980682272; Thu, 12 Sep 2013 03:11:22 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp11320vcz; Thu, 12 Sep 2013 03:11:21 -0700 (PDT) X-Received: by 10.68.196.167 with SMTP id in7mr6571712pbc.127.1378980681325; Thu, 12 Sep 2013 03:11:21 -0700 (PDT) Received: from mail-pd0-f173.google.com (mail-pd0-f173.google.com [209.85.192.173]) by mx.google.com with ESMTPS id u4si2333578pbi.334.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 12 Sep 2013 03:11:21 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.192.173 is neither permitted nor denied by best guess record for domain of viresh.kumar@linaro.org) client-ip=209.85.192.173; Received: by mail-pd0-f173.google.com with SMTP id p10so10511935pdj.32 for ; Thu, 12 Sep 2013 03:11:20 -0700 (PDT) X-Received: by 10.68.245.227 with SMTP id xr3mr586996pbc.182.1378980680865; Thu, 12 Sep 2013 03:11:20 -0700 (PDT) Received: from localhost ([106.197.30.106]) by mx.google.com with ESMTPSA id bt1sm3822535pbb.2.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 12 Sep 2013 03:11:20 -0700 (PDT) From: Viresh Kumar To: dev@openvswitch.org Cc: linaro-networking@linaro.org, patches@linaro.org, Viresh Kumar Subject: [PATCH V2] datapath: Fix compilation errors on RT kernel Date: Thu, 12 Sep 2013 15:41:13 +0530 Message-Id: <700aa719bf006c752489fee17d22a88394531210.1378978041.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 1.7.12.rc2.18.g61b472e X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: viresh.kumar@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.52 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , On latest RT kernels we are getting following errors while compiling OVS: In file included from openvswitch/datapath/linux/compat/include/linux/if_vlan.h:6:0, from openvswitch/datapath/linux/actions.c:29: lng.git/include/linux/if_vlan.h: In function vlan_insert_tag: lng.git/include/linux/if_vlan.h:197:5: error: struct sk_buff has no member named mac In file included from openvswitch/datapath/linux/../flow.h:34:0, from openvswitch/datapath/linux/../datapath.h:31, from openvswitch/datapath/linux/actions.c:36: lng.git/include/net/inet_ecn.h: In function INET_ECN_set_ce: lng.git/include/net/inet_ecn.h:137:10: error: struct sk_buff has no member named nh lng.git/include/net/inet_ecn.h:142:10: error: struct sk_buff has no member named nh openvswitch/datapath/linux/actions.c: In function __pop_vlan_tci: openvswitch/datapath/linux/actions.c:72:5: error: struct sk_buff has no member named mac make[7]: *** [openvswitch/datapath/linux/actions.o] Error 1 make[6]: *** [_module_openvswitch/datapath/linux] Error 2 This happened because RT kernel has used raw keyword inside skbuff.h, which was used to identify some older kernels stuff in OVS. Lets make the search pattern a bit stronger by searching "*raw;" instead of "raw". Signed-off-by: Viresh Kumar --- V1->V2: - Instead of removing OVS_GREP_IFELSE() for searching raw, make grep pattern stronger. acinclude.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acinclude.m4 b/acinclude.m4 index 071fe54..57302b0 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -240,7 +240,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])])