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 <hauke@hauke-m.de>
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>

diff --git a/backport/backport-include/linux/skbuff.h b/backport/backport-include/linux/skbuff.h
index d68739acce47b4055fabaad182aba13c1bccb712..52612ced3496a0aa433339bac3892f7c926b9b8a 100644 (file)
--- 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 */