diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /net/sched/sch_atm.c | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'net/sched/sch_atm.c')
| -rw-r--r-- | net/sched/sch_atm.c | 1 |
1 files changed, 1 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); |