OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8786395
)
gdm72xx: Move away from NLMSG_PUT().
author
David S. Miller
<davem@davemloft.net>
Wed, 27 Jun 2012 04:20:52 +0000
(21:20 -0700)
committer
David S. Miller
<davem@davemloft.net>
Wed, 27 Jun 2012 04:20:52 +0000
(21:20 -0700)
And use nlmsg_data() while we're here too.
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/staging/gdm72xx/netlink_k.c
patch
|
blob
|
history
diff --git
a/drivers/staging/gdm72xx/netlink_k.c
b/drivers/staging/gdm72xx/netlink_k.c
index
292af0f
..
d0cb48a
100644
(file)
--- a/
drivers/staging/gdm72xx/netlink_k.c
+++ b/
drivers/staging/gdm72xx/netlink_k.c
@@
-127,8
+127,12
@@
int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len)
}
seq++;
- nlh = NLMSG_PUT(skb, 0, seq, type, len);
- memcpy(NLMSG_DATA(nlh), msg, len);
+ nlh = nlmsg_put(skb, 0, seq, type, len, 0);
+ if (!nlh) {
+ kfree_skb(skb);
+ return -EMSGSIZE;
+ }
+ memcpy(nlmsg_data(nlh), msg, len);
NETLINK_CB(skb).pid = 0;
NETLINK_CB(skb).dst_group = 0;
@@
-144,7
+148,5
@@
int netlink_send(struct sock *sock, int group, u16 type, void *msg, int len)
}
ret = 0;
}
-
-nlmsg_failure:
return ret;
}