diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-12-08 16:08:13 +0100 |
---|---|---|
committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2013-12-08 19:30:42 +0100 |
commit | c8f2587ebc13e4f1b23fc4b6626543cb15e423e0 (patch) | |
tree | 24c3eee4f3176508a7b5ba693c034ad3fba70588 /backport | |
parent | c42ee127c76d3c7815616076879fdd721cb07328 (diff) |
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 <hauke@hauke-m.de>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
Diffstat (limited to 'backport')
-rw-r--r-- | backport/backport-include/linux/skbuff.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/backport/backport-include/linux/skbuff.h b/backport/backport-include/linux/skbuff.h index f4fea19c..43d33ca6 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 |