diff options
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/route.h | 2 | ||||
-rw-r--r-- | include/net/sch_generic.h | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/include/net/route.h b/include/net/route.h index 2bfbc93..a36ae42 100644 --- a/include/net/route.h +++ b/include/net/route.h @@ -164,9 +164,9 @@ static inline struct rtable *ip_route_output(struct net *net, __be32 daddr, { struct flowi4 fl4 = { .flowi4_oif = oif, + .flowi4_tos = tos, .daddr = daddr, .saddr = saddr, - .flowi4_tos = tos, }; return ip_route_output_key(net, &fl4); } diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index 55ce96b..9d7d54a 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); } |