← Back to branch summary

~ubuntu-branches/ubuntu/saucy/linux-ti-omap4/saucy-proposed

« back to all changes in this revision

Viewing changes to net/sched/sch_dsmark.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Stefan Bader, Upstream Kernel Changes
  • Date: 2012-08-15 17:17:43 UTC
  • Revision ID: package-import@ubuntu.com-20120815171743-h5wnuf51xe7pvdid
Tags: 3.5.0-207.13
[ Paolo Pisati ]

* Start new release

[ Stefan Bader ]

* (config) Enable getabis to use local package copies

[ Upstream Kernel Changes ]

* fixup: gargabe collect iva_seq[0|1] init
* [Config] enable all SND_OMAP_SOC_*s
* fixup: cm2xxx_3xxx.o is needed for omap2_cm_read|write_reg
* fixup: add some snd_soc_dai* helper functions
* fixup: s/snd_soc_dpcm_params/snd_soc_dpcm/g
* fixup: typo, no_host_mode and useless SDP4430 init
* fixup: enable again aess hwmod

Show diffs side-by-side

added added

removed removed

Lines of Context:
net/sched/sch_dsmark.c
265
265
        return NET_XMIT_SUCCESS;
266
266
 
267
267
drop:
268
 
        kfree_skb(skb);
269
 
        sch->qstats.drops++;
 
268
        qdisc_drop(skb, sch);
270
269
        return NET_XMIT_SUCCESS | __NET_XMIT_BYPASS;
271
270
}
272
271
 
429
428
        opts = nla_nest_start(skb, TCA_OPTIONS);
430
429
        if (opts == NULL)
431
430
                goto nla_put_failure;
432
 
        NLA_PUT_U8(skb, TCA_DSMARK_MASK, p->mask[cl - 1]);
433
 
        NLA_PUT_U8(skb, TCA_DSMARK_VALUE, p->value[cl - 1]);
 
431
        if (nla_put_u8(skb, TCA_DSMARK_MASK, p->mask[cl - 1]) ||
 
432
            nla_put_u8(skb, TCA_DSMARK_VALUE, p->value[cl - 1]))
 
433
                goto nla_put_failure;
434
434
 
435
435
        return nla_nest_end(skb, opts);
436
436
 
447
447
        opts = nla_nest_start(skb, TCA_OPTIONS);
448
448
        if (opts == NULL)
449
449
                goto nla_put_failure;
450
 
        NLA_PUT_U16(skb, TCA_DSMARK_INDICES, p->indices);
451
 
 
452
 
        if (p->default_index != NO_DEFAULT_INDEX)
453
 
                NLA_PUT_U16(skb, TCA_DSMARK_DEFAULT_INDEX, p->default_index);
454
 
 
455
 
        if (p->set_tc_index)
456
 
                NLA_PUT_FLAG(skb, TCA_DSMARK_SET_TC_INDEX);
 
450
        if (nla_put_u16(skb, TCA_DSMARK_INDICES, p->indices))
 
451
                goto nla_put_failure;
 
452
 
 
453
        if (p->default_index != NO_DEFAULT_INDEX &&
 
454
            nla_put_u16(skb, TCA_DSMARK_DEFAULT_INDEX, p->default_index))
 
455
                goto nla_put_failure;
 
456
 
 
457
        if (p->set_tc_index &&
 
458
            nla_put_flag(skb, TCA_DSMARK_SET_TC_INDEX))
 
459
                goto nla_put_failure;
457
460
 
458
461
        return nla_nest_end(skb, opts);
459
462