diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2008-08-29 00:27:36 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2008-08-29 00:27:36 +0200 |
| commit | 6c0f7565f134e526fd549538569ad70cd09fefc1 (patch) | |
| tree | 9a2589b99ebf9fd6ef5a9b696038150e2e4a6ba1 | |
| parent | 6a7d6b44f8577d64d3235cddfdfc1579cd9254d5 (diff) | |
| parent | d4536bb1c8decaff4950d229191ec23f359f8ee0 (diff) | |
Merge branch 'devel' of git://git.infradead.org/users/vcgomes/bluez
| -rw-r--r-- | common/glib-helper.c | 3 | ||||
| -rw-r--r-- | network/server.c | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/common/glib-helper.c b/common/glib-helper.c index 33fde08d..64641858 100644 --- a/common/glib-helper.c +++ b/common/glib-helper.c @@ -771,7 +771,6 @@ static int l2cap_bind(struct io_context *io_ctxt, const char *address, { int err; struct l2cap_options l2o; - struct sockaddr_l2 l2a; io_ctxt->fd = socket(PF_BLUETOOTH, SOCK_SEQPACKET, BTPROTO_L2CAP); if (io_ctxt->fd < 0) @@ -797,7 +796,7 @@ static int l2cap_bind(struct io_context *io_ctxt, const char *address, memset(addr, 0, sizeof(*addr)); addr->l2_family = AF_BLUETOOTH; - str2ba(address, &l2a.l2_bdaddr); + str2ba(address, &addr->l2_bdaddr); addr->l2_psm = htobs(psm); err = bind(io_ctxt->fd, (struct sockaddr *) addr, sizeof(*addr)); diff --git a/network/server.c b/network/server.c index 18ee24f6..3fa99d25 100644 --- a/network/server.c +++ b/network/server.c @@ -531,7 +531,8 @@ reply: static void setup_destroy(void *user_data) { - struct timeout *to = user_data; + struct network_adapter *na = user_data; + struct timeout *to = na->to; if (to->id) g_source_remove(to->id); |