← Back to branch summary

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

« back to all changes in this revision

Viewing changes to net/netfilter/nfnetlink_cttimeout.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/netfilter/nfnetlink_cttimeout.c
170
170
        nfmsg->version = NFNETLINK_V0;
171
171
        nfmsg->res_id = 0;
172
172
 
173
 
        NLA_PUT_STRING(skb, CTA_TIMEOUT_NAME, timeout->name);
174
 
        NLA_PUT_BE16(skb, CTA_TIMEOUT_L3PROTO, htons(timeout->l3num));
175
 
        NLA_PUT_U8(skb, CTA_TIMEOUT_L4PROTO, timeout->l4proto->l4proto);
176
 
        NLA_PUT_BE32(skb, CTA_TIMEOUT_USE,
177
 
                        htonl(atomic_read(&timeout->refcnt)));
 
173
        if (nla_put_string(skb, CTA_TIMEOUT_NAME, timeout->name) ||
 
174
            nla_put_be16(skb, CTA_TIMEOUT_L3PROTO, htons(timeout->l3num)) ||
 
175
            nla_put_u8(skb, CTA_TIMEOUT_L4PROTO, timeout->l4proto->l4proto) ||
 
176
            nla_put_be32(skb, CTA_TIMEOUT_USE,
 
177
                         htonl(atomic_read(&timeout->refcnt))))
 
178
                goto nla_put_failure;
178
179
 
179
180
        if (likely(l4proto->ctnl_timeout.obj_to_nlattr)) {
180
181
                struct nlattr *nest_parms;