projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge linux-stable 3.0.28 into android-3.0
[firefly-linux-kernel-4.4.55.git]
/
include
/
net
/
sch_generic.h
diff --git
a/include/net/sch_generic.h
b/include/net/sch_generic.h
index b931f021d7ab4712f3fa553bef09229f5bf5aeb4..f1fbe2d5e0559e580bb5e01a893106dbcffd4eca 100644
(file)
--- a/
include/net/sch_generic.h
+++ b/
include/net/sch_generic.h
@@
-219,9
+219,16
@@
struct tcf_proto {
struct qdisc_skb_cb {
unsigned int pkt_len;
struct qdisc_skb_cb {
unsigned int pkt_len;
-
long data[
];
+
unsigned char data[24
];
};
};
+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(qcb->data) < sz);
+}
+
static inline int qdisc_qlen(struct Qdisc *q)
{
return q->q.qlen;
static inline int qdisc_qlen(struct Qdisc *q)
{
return q->q.qlen;