← Back to branch summary

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

« back to all changes in this revision

Viewing changes to net/core/fib_rules.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/core/fib_rules.c
542
542
        frh = nlmsg_data(nlh);
543
543
        frh->family = ops->family;
544
544
        frh->table = rule->table;
545
 
        NLA_PUT_U32(skb, FRA_TABLE, rule->table);
 
545
        if (nla_put_u32(skb, FRA_TABLE, rule->table))
 
546
                goto nla_put_failure;
546
547
        frh->res1 = 0;
547
548
        frh->res2 = 0;
548
549
        frh->action = rule->action;
553
554
                frh->flags |= FIB_RULE_UNRESOLVED;
554
555
 
555
556
        if (rule->iifname[0]) {
556
 
                NLA_PUT_STRING(skb, FRA_IIFNAME, rule->iifname);
557
 
 
 
557
                if (nla_put_string(skb, FRA_IIFNAME, rule->iifname))
 
558
                        goto nla_put_failure;
558
559
                if (rule->iifindex == -1)
559
560
                        frh->flags |= FIB_RULE_IIF_DETACHED;
560
561
        }
561
562
 
562
563
        if (rule->oifname[0]) {
563
 
                NLA_PUT_STRING(skb, FRA_OIFNAME, rule->oifname);
564
 
 
 
564
                if (nla_put_string(skb, FRA_OIFNAME, rule->oifname))
 
565
                        goto nla_put_failure;
565
566
                if (rule->oifindex == -1)
566
567
                        frh->flags |= FIB_RULE_OIF_DETACHED;
567
568
        }
568
569
 
569
 
        if (rule->pref)
570
 
                NLA_PUT_U32(skb, FRA_PRIORITY, rule->pref);
571
 
 
572
 
        if (rule->mark)
573
 
                NLA_PUT_U32(skb, FRA_FWMARK, rule->mark);
574
 
 
575
 
        if (rule->mark_mask || rule->mark)
576
 
                NLA_PUT_U32(skb, FRA_FWMASK, rule->mark_mask);
577
 
 
578
 
        if (rule->target)
579
 
                NLA_PUT_U32(skb, FRA_GOTO, rule->target);
580
 
 
 
570
        if ((rule->pref &&
 
571
             nla_put_u32(skb, FRA_PRIORITY, rule->pref)) ||
 
572
            (rule->mark &&
 
573
             nla_put_u32(skb, FRA_FWMARK, rule->mark)) ||
 
574
            ((rule->mark_mask || rule->mark) &&
 
575
             nla_put_u32(skb, FRA_FWMASK, rule->mark_mask)) ||
 
576
            (rule->target &&
 
577
             nla_put_u32(skb, FRA_GOTO, rule->target)))
 
578
                goto nla_put_failure;
581
579
        if (ops->fill(rule, skb, frh) < 0)
582
580
                goto nla_put_failure;
583
581