diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-06-21 13:44:42 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-06-21 13:44:42 +0900 |
| commit | 7b98cf0cf4e8798b9e7435f966ed0d90a2a925de (patch) | |
| tree | a5d2a80f121a5c854773ddc85b1d9cbd6b840861 /include/net/sch_generic.h | |
| parent | e1eaf354528ceb002c8e2840a55c44cd76aaaed8 (diff) | |
| parent | 06d5631f56460917af3d9417ef63811cf0cad9ce (diff) | |
| download | blackbird-op-linux-7b98cf0cf4e8798b9e7435f966ed0d90a2a925de.tar.gz blackbird-op-linux-7b98cf0cf4e8798b9e7435f966ed0d90a2a925de.zip | |
Merge branch 'common/pfc' into sh-latest
Diffstat (limited to 'include/net/sch_generic.h')
| -rw-r--r-- | include/net/sch_generic.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index 55ce96b53b09..9d7d54a00e63 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h @@ -220,13 +220,16 @@ struct tcf_proto { struct qdisc_skb_cb { unsigned int pkt_len; - unsigned char data[24]; + u16 bond_queue_mapping; + u16 _pad; + unsigned char data[20]; }; static inline void qdisc_cb_private_validate(const struct sk_buff *skb, int sz) { struct qdisc_skb_cb *qcb; - BUILD_BUG_ON(sizeof(skb->cb) < sizeof(unsigned int) + sz); + + BUILD_BUG_ON(sizeof(skb->cb) < offsetof(struct qdisc_skb_cb, data) + sz); BUILD_BUG_ON(sizeof(qcb->data) < sz); } |
