From 22048609b18cfc7d51b316d223440a71bdd19309 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 11 Aug 2012 02:30:07 +0200 Subject: [PATCH] compat: move RHEL mask for qdisc_cb_private_validate Move the mask for qdisc_cb_private_validate directly in front of the function to it is only included when this function is really used from compat. Signed-off-by: Hauke Mehrtens Signed-off-by: Luis R. Rodriguez --- include/linux/compat-3.3.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/linux/compat-3.3.h b/include/linux/compat-3.3.h index 956d4c042385..61d33b036a24 100644 --- a/include/linux/compat-3.3.h +++ b/include/linux/compat-3.3.h @@ -10,15 +10,17 @@ #include #include -/* mask qdisc_cb_private_validate as RHEL6 backports this */ -#define qdisc_cb_private_validate(a,b) compat_qdisc_cb_private_validate(a,b) #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))) #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,37)) +/* mask qdisc_cb_private_validate as RHEL6 backports this */ +#define qdisc_cb_private_validate(a,b) compat_qdisc_cb_private_validate(a,b) 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 +/* mask qdisc_cb_private_validate as RHEL6 backports this */ +#define qdisc_cb_private_validate(a,b) compat_qdisc_cb_private_validate(a,b) static inline void qdisc_cb_private_validate(const struct sk_buff *skb, int sz) { /* XXX ? */ -- 2.30.2