Attachment #359732 for bug #483486

View | Details | Raw Unified | Return to bug 483486
Collapse All | Expand All

Lines 240-247 AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ Link Here

(-)a/acinclude.m4 (-2 lines)
240	# quoting rules.	240	# quoting rules.
241	OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [[[^@]]proto_data_valid],	241	OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [[[^@]]proto_data_valid],
242	[OVS_DEFINE([HAVE_PROTO_DATA_VALID])])	242	[OVS_DEFINE([HAVE_PROTO_DATA_VALID])])
243	OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [raw],
244	[OVS_DEFINE([HAVE_MAC_RAW])])
245	OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_dst(],	243	OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_dst(],
246	[OVS_DEFINE([HAVE_SKB_DST_ACCESSOR_FUNCS])])	244	[OVS_DEFINE([HAVE_SKB_DST_ACCESSOR_FUNCS])])
247	OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h],	245	OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h],




#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)
{

Return to bug 483486

Lines 95-106 static inline struct rtable skb_rtable(const struct sk_buff skb) Link Here

(-)a/datapath/linux/compat/include/linux/skbuff.h (-6 lines)
95	#define CHECKSUM_COMPLETE CHECKSUM_HW	95	#define CHECKSUM_COMPLETE CHECKSUM_HW
96	#endif	96	#endif
97		97
98	#ifdef HAVE_MAC_RAW
99	#define mac_header mac.raw
100	#define network_header nh.raw
101	#define transport_header h.raw
102	#endif
103
104	#ifndef HAVE_SKBUFF_HEADER_HELPERS	98	#ifndef HAVE_SKBUFF_HEADER_HELPERS
105	static inline unsigned char skb_transport_header(const struct sk_buff skb)	99	static inline unsigned char skb_transport_header(const struct sk_buff skb)
106	{	100	{