← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to net/sched/sch_atm.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
net/sched/sch_atm.c
319
319
         * creation), and one for the reference held when calling delete.
320
320
         */
321
321
        if (flow->ref < 2) {
322
 
                printk(KERN_ERR "atm_tc_delete: flow->ref == %d\n", flow->ref);
 
322
                pr_err("atm_tc_delete: flow->ref == %d\n", flow->ref);
323
323
                return -EINVAL;
324
324
        }
325
325
        if (flow->ref > 2)
384
384
                        }
385
385
                }
386
386
                flow = NULL;
387
 
        done:
388
 
                ;               
 
387
done:
 
388
                ;
389
389
        }
390
 
        if (!flow)
 
390
        if (!flow) {
391
391
                flow = &p->link;
392
 
        else {
 
392
        } else {
393
393
                if (flow->vcc)
394
394
                        ATM_SKB(skb)->atm_options = flow->vcc->atm_options;
395
395
                /*@@@ looks good ... but it's not supposed to work :-) */
576
576
 
577
577
        list_for_each_entry_safe(flow, tmp, &p->flows, list) {
578
578
                if (flow->ref > 1)
579
 
                        printk(KERN_ERR "atm_destroy: %p->ref = %d\n", flow,
580
 
                               flow->ref);
 
579
                        pr_err("atm_destroy: %p->ref = %d\n", flow, flow->ref);
581
580
                atm_tc_put(sch, (unsigned long)flow);
582
581
        }
583
582
        tasklet_kill(&p->task);
616
615
        }
617
616
        if (flow->excess)
618
617
                NLA_PUT_U32(skb, TCA_ATM_EXCESS, flow->classid);
619
 
        else {
 
618
        else
620
619
                NLA_PUT_U32(skb, TCA_ATM_EXCESS, 0);
621
 
        }
622
620
 
623
621
        nla_nest_end(skb, nest);
624
622
        return skb->len;