From 2419525c21e9e04dacebe52199e8d9ee03ed2a20 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 1 Jun 2013 18:00:13 +0200 Subject: [PATCH] backports: do not backport skb_tx_timestamp() on RHEL 6.4 The skb_tx_timestamp() implementation in RHEL 6.4 actually does something. Signed-off-by: Hauke Mehrtens Signed-off-by: Luis R. Rodriguez --- backport/backport-include/linux/skbuff.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/backport/backport-include/linux/skbuff.h b/backport/backport-include/linux/skbuff.h index d68739acce47..52612ced3496 100644 --- a/backport/backport-include/linux/skbuff.h +++ b/backport/backport-include/linux/skbuff.h @@ -99,10 +99,12 @@ static inline bool skb_defer_rx_timestamp(struct sk_buff *skb) return false; } +#if (RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(6,4)) static inline void skb_tx_timestamp(struct sk_buff *skb) { } #endif +#endif #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,33) /* mask netdev_alloc_skb_ip_align as debian squeeze also backports this */ -- 2.30.2