Merge 3.3-rc7 into usb-next

[~andy/linux] / net / sched / sch_choke.c

diff --git a/net/sched/sch_choke.c b/net/sched/sch_choke.c
index e465064d39a369aad077f8ed55a54fd1f1cac31d..7e267d7b9c75730ef8351798ec1540b92e31f101 100644 (file)
--- a/net/sched/sch_choke.c
+++ b/net/sched/sch_choke.c
@@ -148,8 +148,7 @@ struct choke_skb_cb {
 
 static inline struct choke_skb_cb *choke_skb_cb(const struct sk_buff *skb)
 {
-       BUILD_BUG_ON(sizeof(skb->cb) <
-               sizeof(struct qdisc_skb_cb) + sizeof(struct choke_skb_cb));
+       qdisc_cb_private_validate(skb, sizeof(struct choke_skb_cb));
        return (struct choke_skb_cb *)qdisc_skb_cb(skb)->data;
 }