Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 359732 Details for
Bug 483486
net-misc/openvswitch-{1.10.0,1.11.0} version bump
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
datapath: remove HAVE_MAC_RAW
file_483486.txt (text/plain), 3.60 KB, created by
Florian Steinel
on 2013-09-29 12:13:51 UTC
(
hide
)
Description:
datapath: remove HAVE_MAC_RAW
Filename:
MIME Type:
Creator:
Florian Steinel
Created:
2013-09-29 12:13:51 UTC
Size:
3.60 KB
patch
obsolete
>From: Viresh Kumar <viresh.kumar@linaro.org> >Date: Mon, 26 Aug 2013 06:36:06 +0000 (+0530) >Subject: datapath: remove HAVE_MAC_RAW >X-Git-Url: http://git.openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff_plain;h=63a04c1b5fdbf5a0acfe7e39f27445dd5008c45f;hp=23c57097b4c6ddf71684627bdd740d93037d1ce7 > >datapath: remove HAVE_MAC_RAW > >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 <viresh.kumar@linaro.org> >Signed-off-by: Jesse Gross <jesse@nicira.com> >--- > >diff --git a/acinclude.m4 b/acinclude.m4 >index 071fe54..c293d33 100644 >--- a/acinclude.m4 >+++ b/acinclude.m4 >@@ -240,8 +240,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 a486096..9868a98 100644 >--- a/datapath/linux/compat/include/linux/skbuff.h >+++ b/datapath/linux/compat/include/linux/skbuff.h >@@ -95,12 +95,6 @@ static inline struct rtable *skb_rtable(const 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) > { >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 483486
:
357762
|
359732
|
359756