From ba858d3ec52493a54e01f1e6c2b5f9a695d4d25f Mon Sep 17 00:00:00 2001 From: root Date: Wed, 23 Apr 2008 15:48:56 -0700 Subject: [PATCH] CHECKSUM_COMPLETE and CHECKSUM_PARTIAL were added Linux 2.6.19, so update the compatiblity layer to reflect this. --- .../linux-2.6/compat-2.6/include/linux/skbuff.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/datapath/linux-2.6/compat-2.6/include/linux/skbuff.h b/datapath/linux-2.6/compat-2.6/include/linux/skbuff.h index 67726747..1b779ef7 100644 --- a/datapath/linux-2.6/compat-2.6/include/linux/skbuff.h +++ b/datapath/linux-2.6/compat-2.6/include/linux/skbuff.h @@ -16,16 +16,19 @@ static inline void kfree_skb_maybe_null(struct sk_buff *skb) } #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) - -#define mac_header mac.raw -#define network_header nh.raw - +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) /* Note that CHECKSUM_PARTIAL is not implemented, but this allows us to at * least test against it: see update_csum() in forward.c. */ #define CHECKSUM_PARTIAL 3 #define CHECKSUM_COMPLETE CHECKSUM_HW +#endif /* linux kernel < 2.6.19 */ + + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) + +#define mac_header mac.raw +#define network_header nh.raw static inline unsigned char *skb_transport_header(const struct sk_buff *skb) { -- 2.30.2