aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2006-03-20 22:01:06 -0500
committerDavid S. Miller <davem@davemloft.net>2006-03-20 22:01:06 -0500
commitcdc7f8e362bcadbc312c97fb69d8d59676eec422 (patch)
treebbdf644a287b3e98b9ede73ba55e9de79682e28d
parent6d037a26f08711a222ed0d3d12b09e93eed7d3e8 (diff)
[PKT_SCHED]: Dump child qdisc handle in sch_{atm,dsmark}
A qdisc should set tcm_info to the child qdisc handle in its class dump function. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/sched/sch_atm.c1
-rw-r--r--net/sched/sch_dsmark.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/net/sched/sch_atm.c b/net/sched/sch_atm.c
index 93ebce40acac..ac7cb60d1e25 100644
--- a/net/sched/sch_atm.c
+++ b/net/sched/sch_atm.c
@@ -638,6 +638,7 @@ static int atm_tc_dump_class(struct Qdisc *sch, unsigned long cl,
638 sch,p,flow,skb,tcm); 638 sch,p,flow,skb,tcm);
639 if (!find_flow(p,flow)) return -EINVAL; 639 if (!find_flow(p,flow)) return -EINVAL;
640 tcm->tcm_handle = flow->classid; 640 tcm->tcm_handle = flow->classid;
641 tcm->tcm_info = flow->q->handle;
641 rta = (struct rtattr *) b; 642 rta = (struct rtattr *) b;
642 RTA_PUT(skb,TCA_OPTIONS,0,NULL); 643 RTA_PUT(skb,TCA_OPTIONS,0,NULL);
643 RTA_PUT(skb,TCA_ATM_HDR,flow->hdr_len,flow->hdr); 644 RTA_PUT(skb,TCA_ATM_HDR,flow->hdr_len,flow->hdr);
diff --git a/net/sched/sch_dsmark.c b/net/sched/sch_dsmark.c
index 13e0e7b3856b..f6320ca70493 100644
--- a/net/sched/sch_dsmark.c
+++ b/net/sched/sch_dsmark.c
@@ -438,6 +438,7 @@ static int dsmark_dump_class(struct Qdisc *sch, unsigned long cl,
438 return -EINVAL; 438 return -EINVAL;
439 439
440 tcm->tcm_handle = TC_H_MAKE(TC_H_MAJ(sch->handle), cl-1); 440 tcm->tcm_handle = TC_H_MAKE(TC_H_MAJ(sch->handle), cl-1);
441 tcm->tcm_info = p->q->handle;
441 442
442 opts = RTA_NEST(skb, TCA_OPTIONS); 443 opts = RTA_NEST(skb, TCA_OPTIONS);
443 RTA_PUT_U8(skb,TCA_DSMARK_MASK, p->mask[cl-1]); 444 RTA_PUT_U8(skb,TCA_DSMARK_MASK, p->mask[cl-1]);