diff options
| author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2012-03-01 07:24:22 -0500 |
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2012-03-01 07:26:51 -0500 |
| commit | 89d4a1753b6632327f18d6c8e0842b366b736621 (patch) | |
| tree | eb74be7a995d5b5b3f29f5c6794736a514109d80 /net/sched/sch_sfq.c | |
| parent | 7eca30aef7961e68ad74c0ef920546c2be7f6579 (diff) | |
| parent | 280ad7fda5f95211857fda38960f2b6fdf6edd3e (diff) | |
Merge branch 'irqdomain/next' of git://git.secretlab.ca/git/linux-2.6
Diffstat (limited to 'net/sched/sch_sfq.c')
| -rw-r--r-- | net/sched/sch_sfq.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c index 67494aef9acf..60d47180f043 100644 --- a/net/sched/sch_sfq.c +++ b/net/sched/sch_sfq.c | |||
| @@ -166,9 +166,8 @@ struct sfq_skb_cb { | |||
| 166 | 166 | ||
| 167 | static inline struct sfq_skb_cb *sfq_skb_cb(const struct sk_buff *skb) | 167 | static inline struct sfq_skb_cb *sfq_skb_cb(const struct sk_buff *skb) |
| 168 | { | 168 | { |
| 169 | BUILD_BUG_ON(sizeof(skb->cb) < | 169 | qdisc_cb_private_validate(skb, sizeof(struct sfq_skb_cb)); |
| 170 | sizeof(struct qdisc_skb_cb) + sizeof(struct sfq_skb_cb)); | 170 | return (struct sfq_skb_cb *)qdisc_skb_cb(skb)->data; |
| 171 | return (struct sfq_skb_cb *)qdisc_skb_cb(skb)->data; | ||
| 172 | } | 171 | } |
| 173 | 172 | ||
| 174 | static unsigned int sfq_hash(const struct sfq_sched_data *q, | 173 | static unsigned int sfq_hash(const struct sfq_sched_data *q, |