git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
net
/
sched
/
sch_cbq.c
diff --git
a/net/sched/sch_cbq.c
b/net/sched/sch_cbq.c
index
d43e3b8
..
6cd8170
100644
(file)
--- a/
net/sched/sch_cbq.c
+++ b/
net/sched/sch_cbq.c
@@
-257,7
+257,7
@@
cbq_classify(struct sk_buff *skb, struct Qdisc *sch, int *qerr)
(cl = cbq_class_lookup(q, prio)) != NULL)
return cl;
(cl = cbq_class_lookup(q, prio)) != NULL)
return cl;
- *qerr = NET_XMIT_
DROP
;
+ *qerr = NET_XMIT_
BYPASS
;
for (;;) {
int result = 0;
defmap = head->defaults;
for (;;) {
int result = 0;
defmap = head->defaults;
@@
-413,7
+413,7
@@
cbq_enqueue(struct sk_buff *skb, struct Qdisc *sch)
q->rx_class = cl;
#endif
if (cl == NULL) {
q->rx_class = cl;
#endif
if (cl == NULL) {
- if (ret == NET_XMIT_
DROP
)
+ if (ret == NET_XMIT_
BYPASS
)
sch->qstats.drops++;
kfree_skb(skb);
return ret;
sch->qstats.drops++;
kfree_skb(skb);
return ret;
@@
-1528,6
+1528,7
@@
static __inline__ int cbq_dump_ovl(struct sk_buff *skb, struct cbq_class *cl)
opt.strategy = cl->ovl_strategy;
opt.priority2 = cl->priority2+1;
opt.strategy = cl->ovl_strategy;
opt.priority2 = cl->priority2+1;
+ opt.pad = 0;
opt.penalty = (cl->penalty*1000)/HZ;
RTA_PUT(skb, TCA_CBQ_OVL_STRATEGY, sizeof(opt), &opt);
return skb->len;
opt.penalty = (cl->penalty*1000)/HZ;
RTA_PUT(skb, TCA_CBQ_OVL_STRATEGY, sizeof(opt), &opt);
return skb->len;
@@
-1563,6
+1564,8
@@
static __inline__ int cbq_dump_police(struct sk_buff *skb, struct cbq_class *cl)
if (cl->police) {
opt.police = cl->police;
if (cl->police) {
opt.police = cl->police;
+ opt.__res1 = 0;
+ opt.__res2 = 0;
RTA_PUT(skb, TCA_CBQ_POLICE, sizeof(opt), &opt);
}
return skb->len;
RTA_PUT(skb, TCA_CBQ_POLICE, sizeof(opt), &opt);
}
return skb->len;