openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "libnl: BUGFIX to support wpa_supplicant p2p_find"

This commit is contained in:
Frank Maker 2011-08-03 14:41:51 -07:00 committed by Android (Google) Code Review
parent 319f4e2793 69bc179b20
commit 2a9050a0dc
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libnl_2/attr.c
View File

@ -87,8 +87,17 @@ struct nlattr *nla_nest_start(struct nl_msg *msg, int attrtype)
/* Finalize nesting of attributes. */
int nla_nest_end(struct nl_msg *msg, struct nlattr *start)
{
struct nlattr *container;
/* Adjust nested attribute container size */
container = (unsigned char *) start - sizeof(struct nlattr);
container->nla_len = (unsigned char *) \
nlmsg_tail(nlmsg_hdr(msg)) - (unsigned char *)container;
/* Fix attribute size */
start->nla_len = (unsigned char *) \
nlmsg_tail(nlmsg_hdr(msg)) - (unsigned char *)start;
return 0;
}

1
libnl_2/socket.c
View File

@ -91,6 +91,7 @@ struct nl_sock *nl_socket_alloc_cb(struct nl_cb *cb)
void nl_socket_free(struct nl_sock *sk)
{
nl_cb_put(sk->s_cb);
close(sk->s_fd);
free(sk);
}