Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[mirror_ubuntu-artful-kernel.git] / lib / nlattr.c

diff --git a/lib/nlattr.c b/lib/nlattr.c
index a7e0b16078dff5035d1494d15f62622fdfe54b66..fb52435be42dda3a5e7041b3554712bc80b4caad 100644 (file)
--- a/lib/nlattr.c
+++ b/lib/nlattr.c
@@ -352,7 +352,7 @@ struct nlattr *__nla_reserve(struct sk_buff *skb, int attrtype, int attrlen)
 {
        struct nlattr *nla;
 
-       nla = (struct nlattr *) skb_put(skb, nla_total_size(attrlen));
+       nla = skb_put(skb, nla_total_size(attrlen));
        nla->nla_type = attrtype;
        nla->nla_len = nla_attr_size(attrlen);
 
@@ -398,12 +398,7 @@ EXPORT_SYMBOL(__nla_reserve_64bit);
  */
 void *__nla_reserve_nohdr(struct sk_buff *skb, int attrlen)
 {
-       void *start;
-
-       start = skb_put(skb, NLA_ALIGN(attrlen));
-       memset(start, 0, NLA_ALIGN(attrlen));
-
-       return start;
+       return skb_put_zero(skb, NLA_ALIGN(attrlen));
 }
 EXPORT_SYMBOL(__nla_reserve_nohdr);
 
@@ -617,7 +612,7 @@ int nla_append(struct sk_buff *skb, int attrlen, const void *data)
        if (unlikely(skb_tailroom(skb) < NLA_ALIGN(attrlen)))
                return -EMSGSIZE;
 
-       memcpy(skb_put(skb, attrlen), data, attrlen);
+       skb_put_data(skb, data, attrlen);
        return 0;
 }
 EXPORT_SYMBOL(nla_append);