compat: Add netdev_tx_sent_queue and netdev_tx_completed_queue

[~emulex/for-vlad/old/compat.git] / include / linux / compat-3.3.h

diff --git a/include/linux/compat-3.3.h b/include/linux/compat-3.3.h
index 69bdcd0..45a078a 100644 (file)
--- a/include/linux/compat-3.3.h
+++ b/include/linux/compat-3.3.h
@@ -8,6 +8,23 @@
 /* include to override NL80211_FEATURE_SK_TX_STATUS */
 #include <linux/nl80211.h>
 #include <linux/skbuff.h>
+#include <net/sch_generic.h>
+
+#if !((LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,9) && LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)) || (LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,23) && LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0)))
+/* mask qdisc_cb_private_validate as RHEL6.3 backports it */
+#define qdisc_cb_private_validate(a, b) compat_qdisc_cb_private_validate(a, b)
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,37))
+static inline void qdisc_cb_private_validate(const struct sk_buff *skb, int sz)
+{
+       BUILD_BUG_ON(sizeof(skb->cb) < sizeof(struct qdisc_skb_cb) + sz);
+}
+#else
+static inline void qdisc_cb_private_validate(const struct sk_buff *skb, int sz)
+{
+       /* XXX ? */
+}
+#endif
+#endif
 
 extern struct sk_buff *__pskb_copy(struct sk_buff *skb,
                                   int headroom, gfp_t gfp_mask);
@@ -55,6 +72,16 @@ module_exit(__driver##_exit);
        module_driver(__usb_driver, usb_register, \
                       usb_deregister)
 
+static inline void netdev_tx_sent_queue(struct netdev_queue *dev_queue,
+                                      unsigned int bytes)
+{
+}
+
+static inline void netdev_tx_completed_queue(struct netdev_queue *dev_queue,
+                                           unsigned pkts, unsigned bytes)
+{
+}
+
 #endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0)) */
 
 #endif /* LINUX_3_3_COMPAT_H */