From: Hauke Mehrtens Date: Sun, 8 Dec 2013 15:08:13 +0000 (+0100) Subject: backports: fix skb_add_rx_fragi() for SLES 11 SP3 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c8f2587ebc13e4f1b23fc4b6626543cb15e423e0;p=openwrt%2Fstaging%2Fblogic.git backports: fix skb_add_rx_fragi() for SLES 11 SP3 SLES 11 SP3 backported skb_add_rx_frag() with 6 arguments and we have to use that function with the truesize parameter. This removes the define for SLES 11 SP3 like it is done for RHEL. Signed-off-by: Hauke Mehrtens Signed-off-by: Luis R. Rodriguez --- diff --git a/backport/backport-include/linux/skbuff.h b/backport/backport-include/linux/skbuff.h index f4fea19c7320..43d33ca6cff7 100644 --- a/backport/backport-include/linux/skbuff.h +++ b/backport/backport-include/linux/skbuff.h @@ -10,7 +10,9 @@ extern void v2_6_28_skb_add_rx_frag(struct sk_buff *skb, int i, #define skb_add_rx_frag(skb, i, page, off, size, truesize) \ v2_6_28_skb_add_rx_frag(skb, i, page, off, size) -#elif (LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)) && (RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(6,4)) +#elif (LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)) && \ + (RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(6,4)) && \ + !(defined(CONFIG_SUSE_KERNEL) && (LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0))) #define skb_add_rx_frag(skb, i, page, off, size, truesize) \ skb_add_rx_frag(skb, i, page, off, size) #endif