diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-06-01 18:00:14 +0200 |
---|---|---|
committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2013-06-05 21:35:49 -0700 |
commit | 05ef1df29c54afa398c18929fc59e4185f75c012 (patch) | |
tree | 50817869a22d56a94ab453491d6e616a214f5bb0 | |
parent | 2419525c21e9e04dacebe52199e8d9ee03ed2a20 (diff) |
backports: to not backport skb_add_rx_fragi() on RHEL 6.4
The kernel in RHEL 6.4 already ships with skb_add_rx_frag() with 6
arguments.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
-rw-r--r-- | backport/backport-include/linux/skbuff.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/backport/backport-include/linux/skbuff.h b/backport/backport-include/linux/skbuff.h index 52612ced..94093e28 100644 --- a/backport/backport-include/linux/skbuff.h +++ b/backport/backport-include/linux/skbuff.h @@ -10,7 +10,7 @@ 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)) +#elif (LINUX_VERSION_CODE < KERNEL_VERSION(3,4,0)) && (RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(6,4)) #define skb_add_rx_frag(skb, i, page, off, size, truesize) \ skb_add_rx_frag(skb, i, page, off, size) #endif |