aboutsummaryrefslogtreecommitdiffstats
path: root/net/sched/sch_atm.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/sched/sch_atm.c')
-rw-r--r--net/sched/sch_atm.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/net/sched/sch_atm.c b/net/sched/sch_atm.c
index edc7bb0b9c8b..afb3bbd571f2 100644
--- a/net/sched/sch_atm.c
+++ b/net/sched/sch_atm.c
@@ -107,7 +107,7 @@ static __inline__ struct atm_flow_data *lookup_flow(struct Qdisc *sch,
107 struct atm_qdisc_data *p = PRIV(sch); 107 struct atm_qdisc_data *p = PRIV(sch);
108 struct atm_flow_data *flow; 108 struct atm_flow_data *flow;
109 109
110 for (flow = p->flows; flow; flow = flow->next) 110 for (flow = p->flows; flow; flow = flow->next)
111 if (flow->classid == classid) break; 111 if (flow->classid == classid) break;
112 return flow; 112 return flow;
113} 113}
@@ -125,7 +125,7 @@ static int atm_tc_graft(struct Qdisc *sch,unsigned long arg,
125 if (!new) new = &noop_qdisc; 125 if (!new) new = &noop_qdisc;
126 *old = xchg(&flow->q,new); 126 *old = xchg(&flow->q,new);
127 if (*old) qdisc_reset(*old); 127 if (*old) qdisc_reset(*old);
128 return 0; 128 return 0;
129} 129}
130 130
131 131
@@ -145,7 +145,7 @@ static unsigned long atm_tc_get(struct Qdisc *sch,u32 classid)
145 145
146 DPRINTK("atm_tc_get(sch %p,[qdisc %p],classid %x)\n",sch,p,classid); 146 DPRINTK("atm_tc_get(sch %p,[qdisc %p],classid %x)\n",sch,p,classid);
147 flow = lookup_flow(sch,classid); 147 flow = lookup_flow(sch,classid);
148 if (flow) flow->ref++; 148 if (flow) flow->ref++;
149 DPRINTK("atm_tc_get: flow %p\n",flow); 149 DPRINTK("atm_tc_get: flow %p\n",flow);
150 return (unsigned long) flow; 150 return (unsigned long) flow;
151} 151}
@@ -280,9 +280,9 @@ static int atm_tc_change(struct Qdisc *sch, u32 classid, u32 parent,
280 opt->rta_type,RTA_PAYLOAD(opt),hdr_len); 280 opt->rta_type,RTA_PAYLOAD(opt),hdr_len);
281 if (!(sock = sockfd_lookup(fd,&error))) return error; /* f_count++ */ 281 if (!(sock = sockfd_lookup(fd,&error))) return error; /* f_count++ */
282 DPRINTK("atm_tc_change: f_count %d\n",file_count(sock->file)); 282 DPRINTK("atm_tc_change: f_count %d\n",file_count(sock->file));
283 if (sock->ops->family != PF_ATMSVC && sock->ops->family != PF_ATMPVC) { 283 if (sock->ops->family != PF_ATMSVC && sock->ops->family != PF_ATMPVC) {
284 error = -EPROTOTYPE; 284 error = -EPROTOTYPE;
285 goto err_out; 285 goto err_out;
286 } 286 }
287 /* @@@ should check if the socket is really operational or we'll crash 287 /* @@@ should check if the socket is really operational or we'll crash
288 on vcc->send */ 288 on vcc->send */
@@ -320,9 +320,9 @@ static int atm_tc_change(struct Qdisc *sch, u32 classid, u32 parent,
320 flow->q = &noop_qdisc; 320 flow->q = &noop_qdisc;
321 DPRINTK("atm_tc_change: qdisc %p\n",flow->q); 321 DPRINTK("atm_tc_change: qdisc %p\n",flow->q);
322 flow->sock = sock; 322 flow->sock = sock;
323 flow->vcc = ATM_SD(sock); /* speedup */ 323 flow->vcc = ATM_SD(sock); /* speedup */
324 flow->vcc->user_back = flow; 324 flow->vcc->user_back = flow;
325 DPRINTK("atm_tc_change: vcc %p\n",flow->vcc); 325 DPRINTK("atm_tc_change: vcc %p\n",flow->vcc);
326 flow->old_pop = flow->vcc->pop; 326 flow->old_pop = flow->vcc->pop;
327 flow->parent = p; 327 flow->parent = p;
328 flow->vcc->pop = sch_atm_pop; 328 flow->vcc->pop = sch_atm_pop;
@@ -391,7 +391,7 @@ static struct tcf_proto **atm_tc_find_tcf(struct Qdisc *sch,unsigned long cl)
391 struct atm_flow_data *flow = (struct atm_flow_data *) cl; 391 struct atm_flow_data *flow = (struct atm_flow_data *) cl;
392 392
393 DPRINTK("atm_tc_find_tcf(sch %p,[qdisc %p],flow %p)\n",sch,p,flow); 393 DPRINTK("atm_tc_find_tcf(sch %p,[qdisc %p],flow %p)\n",sch,p,flow);
394 return flow ? &flow->filter_list : &p->link.filter_list; 394 return flow ? &flow->filter_list : &p->link.filter_list;
395} 395}
396 396
397 397
@@ -546,8 +546,8 @@ static int atm_tc_requeue(struct sk_buff *skb,struct Qdisc *sch)
546 D2PRINTK("atm_tc_requeue(skb %p,sch %p,[qdisc %p])\n",skb,sch,p); 546 D2PRINTK("atm_tc_requeue(skb %p,sch %p,[qdisc %p])\n",skb,sch,p);
547 ret = p->link.q->ops->requeue(skb,p->link.q); 547 ret = p->link.q->ops->requeue(skb,p->link.q);
548 if (!ret) { 548 if (!ret) {
549 sch->q.qlen++; 549 sch->q.qlen++;
550 sch->qstats.requeues++; 550 sch->qstats.requeues++;
551 } else { 551 } else {
552 sch->qstats.drops++; 552 sch->qstats.drops++;
553 p->link.qstats.drops++; 553 p->link.qstats.drops++;
@@ -726,7 +726,7 @@ static int __init atm_init(void)
726 return register_qdisc(&atm_qdisc_ops); 726 return register_qdisc(&atm_qdisc_ops);
727} 727}
728 728
729static void __exit atm_exit(void) 729static void __exit atm_exit(void)
730{ 730{
731 unregister_qdisc(&atm_qdisc_ops); 731 unregister_qdisc(&atm_qdisc_ops);
732} 732}