From patchwork Mon Aug 26 06:36:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 19529 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qe0-f71.google.com (mail-qe0-f71.google.com [209.85.128.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1003E25A57 for ; Mon, 26 Aug 2013 06:36:44 +0000 (UTC) Received: by mail-qe0-f71.google.com with SMTP id 1sf3281625qee.10 for ; Sun, 25 Aug 2013 23:36:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-gm-message-state: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=hmJVpaptJdgaEc6LHM70pqP9agJws/zPb8FEkcnmZ4Q=; b=JdSIrDw5mhtq0aCBEiuq0vC0Y6pNF8A7+QGWtDA9DleaQqVl7HGZS+DbYKQPgOT7nB P6HkvStOiCe7037veioXy92rbuvOLsOH3QpVW1gHyGrxbMePkrFQJQENWm4MCxNBGJ5F iKPH+0/XthjUtk80Z+JZ3L8JMaHB5Bh7aQkEUfrDzAAXD9ziMKETxo6wj6xaW8RzBtbn xzNZxS4BxcdoU2A5t2UlB/xa2bEuiAj25EFo+ZgnT2kDsuDM9ZdraI14FLxoAUwYK7Uj 7cSmZxINCs8Q3SbxAB7Tx7h9mc4qhIiVXSCmzSjptY6oBxRuiCxujbERoI8fxNDbMb3+ ivlQ== X-Received: by 10.236.156.138 with SMTP id m10mr4587488yhk.26.1377499003650; Sun, 25 Aug 2013 23:36:43 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.16.225 with SMTP id j1ls2261598qed.54.gmail; Sun, 25 Aug 2013 23:36:43 -0700 (PDT) X-Received: by 10.58.208.130 with SMTP id me2mr13526643vec.13.1377499003559; Sun, 25 Aug 2013 23:36:43 -0700 (PDT) Received: from mail-ve0-f178.google.com (mail-ve0-f178.google.com [209.85.128.178]) by mx.google.com with ESMTPS id fa1si3254512ved.13.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 25 Aug 2013 23:36:43 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.178 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.178; Received: by mail-ve0-f178.google.com with SMTP id ox1so1794904veb.23 for ; Sun, 25 Aug 2013 23:36:43 -0700 (PDT) X-Gm-Message-State: ALoCoQmEj/FGPJmBMu7si8A4JLdgLKlx1ncs5R77v29pD0j7UYvwensfCAxl1D1fsDo0BKbmGYwY X-Received: by 10.58.211.227 with SMTP id nf3mr1463009vec.20.1377499003429; Sun, 25 Aug 2013 23:36:43 -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 u4csp219392vcz; Sun, 25 Aug 2013 23:36:42 -0700 (PDT) X-Received: by 10.68.12.134 with SMTP id y6mr13691935pbb.29.1377499002164; Sun, 25 Aug 2013 23:36:42 -0700 (PDT) Received: from mail-pd0-f178.google.com (mail-pd0-f178.google.com [209.85.192.178]) by mx.google.com with ESMTPS id yk3si10394295pac.99.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 25 Aug 2013 23:36:34 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.192.178 is neither permitted nor denied by best guess record for domain of viresh.kumar@linaro.org) client-ip=209.85.192.178; Received: by mail-pd0-f178.google.com with SMTP id w10so3041680pde.23 for ; Sun, 25 Aug 2013 23:36:33 -0700 (PDT) X-Received: by 10.68.216.227 with SMTP id ot3mr13656972pbc.80.1377498992787; Sun, 25 Aug 2013 23:36:32 -0700 (PDT) Received: from localhost ([110.225.10.147]) by mx.google.com with ESMTPSA id iu7sm15893833pbc.45.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 25 Aug 2013 23:36:32 -0700 (PDT) From: Viresh Kumar To: dev@openvswitch.org Cc: linaro-networking@linaro.org, patches@linaro.org, Viresh Kumar Subject: [ovs-dev] datapath: remove HAVE_MAC_RAW Date: Mon, 26 Aug 2013 12:06:06 +0530 Message-Id: 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.128.178 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: , This was causing it to fail against latest RT kernels, with following errors: In file included from /home/arm/work/kernel/linaro/lng/openvswitch/datapath/linux/compat/include/linux/if_vlan.h:6:0, from /home/arm/work/kernel/linaro/lng/openvswitch/datapath/linux/actions.c:29: /home/arm/work/kernel/linaro/lng/lng.git/include/linux/if_vlan.h: In function vlan_insert_tag: /home/arm/work/kernel/linaro/lng/lng.git/include/linux/if_vlan.h:197:5: error: struct sk_buff has no member named mac In file included from /home/arm/work/kernel/linaro/lng/openvswitch/datapath/linux/../flow.h:34:0, from /home/arm/work/kernel/linaro/lng/openvswitch/datapath/linux/../datapath.h:31, from /home/arm/work/kernel/linaro/lng/openvswitch/datapath/linux/actions.c:36: /home/arm/work/kernel/linaro/lng/lng.git/include/net/inet_ecn.h: In function INET_ECN_set_ce: /home/arm/work/kernel/linaro/lng/lng.git/include/net/inet_ecn.h:137:10: error: struct sk_buff has no member named nh /home/arm/work/kernel/linaro/lng/lng.git/include/net/inet_ecn.h:142:10: error: struct sk_buff has no member named nh /home/arm/work/kernel/linaro/lng/openvswitch/datapath/linux/actions.c: In function __pop_vlan_tci: /home/arm/work/kernel/linaro/lng/openvswitch/datapath/linux/actions.c:72:5: error: struct sk_buff has no member named mac make[7]: *** [/home/arm/work/kernel/linaro/lng/openvswitch/datapath/linux/actions.o] Error 1 make[6]: *** [_module_/home/arm/work/kernel/linaro/lng/openvswitch/datapath/linux] Error 2 Not sure why it was added earlier but my guess is, for earlier RT kernels struct sk_buff had following variables mac.raw, nh.raw, h.raw instead of mac_header, network_header, transport_header. And so the hack to rename them in OVS code. But that's not the case now. RT kernel have mac_header, network_header and transport_header as parameter and so we don't need this macro at all. Lets get rid of it. Signed-off-by: Viresh Kumar --- acinclude.m4 | 2 -- datapath/linux/compat/include/linux/skbuff.h | 6 ------ 2 files changed, 8 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 73ee5ce..f5d24b0 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -238,8 +238,6 @@ 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_DEFINE([HAVE_MAC_RAW])]) OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_dst(], [OVS_DEFINE([HAVE_SKB_DST_ACCESSOR_FUNCS])]) OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], diff --git a/datapath/linux/compat/include/linux/skbuff.h b/datapath/linux/compat/include/linux/skbuff.h index 461e07c..e432c85 100644 --- a/datapath/linux/compat/include/linux/skbuff.h +++ b/datapath/linux/compat/include/linux/skbuff.h @@ -125,12 +125,6 @@ static inline void kfree_skb_maybe_null(struct sk_buff *skb) #define CHECKSUM_COMPLETE CHECKSUM_HW #endif -#ifdef HAVE_MAC_RAW -#define mac_header mac.raw -#define network_header nh.raw -#define transport_header h.raw -#endif - #ifndef HAVE_SKBUFF_HEADER_HELPERS static inline unsigned char *skb_transport_header(const struct sk_buff *skb) {