Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a9050a0 authored by Frank Maker's avatar Frank Maker Committed by Android (Google) Code Review
Browse files

Merge "libnl: BUGFIX to support wpa_supplicant p2p_find"

parents 319f4e27 69bc179b

libnl_2/attr.c

+9 −0
Original line number Diff line number Diff line
@@ -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;

}

libnl_2/socket.c

+1 −0
Original line number Diff line number Diff line
@@ -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);

}