diff options
author | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-06-09 15:33:54 -0400 |
---|---|---|
committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2011-06-09 15:33:54 -0400 |
commit | 448f2627c169092d2091a1be22feb6a7775f6201 (patch) | |
tree | 8d12460ba978d4f031715ae4bd9e0bc6fee4c5ab /net/bluetooth/rfcomm/sock.c | |
parent | 5a9d0a3ffbc40ea1f5a0636501e7599cbb327bcc (diff) | |
parent | 6de6c18d8d3b2a82cc1c657f005e61b1c1f2f886 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6
Conflicts:
net/bluetooth/rfcomm/sock.c
Diffstat (limited to 'net/bluetooth/rfcomm/sock.c')
-rw-r--r-- | net/bluetooth/rfcomm/sock.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c index bcf077cfd73e..8f01e6b11a70 100644 --- a/net/bluetooth/rfcomm/sock.c +++ b/net/bluetooth/rfcomm/sock.c | |||
@@ -679,7 +679,8 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c | |||
679 | { | 679 | { |
680 | struct sock *sk = sock->sk; | 680 | struct sock *sk = sock->sk; |
681 | struct bt_security sec; | 681 | struct bt_security sec; |
682 | int len, err = 0; | 682 | int err = 0; |
683 | size_t len; | ||
683 | u32 opt; | 684 | u32 opt; |
684 | 685 | ||
685 | BT_DBG("sk %p", sk); | 686 | BT_DBG("sk %p", sk); |
@@ -785,6 +786,7 @@ static int rfcomm_sock_getsockopt_old(struct socket *sock, int optname, char __u | |||
785 | break; | 786 | break; |
786 | } | 787 | } |
787 | 788 | ||
789 | memset(&cinfo, 0, sizeof(cinfo)); | ||
788 | cinfo.hci_handle = conn->hcon->handle; | 790 | cinfo.hci_handle = conn->hcon->handle; |
789 | memcpy(cinfo.dev_class, conn->hcon->dev_class, 3); | 791 | memcpy(cinfo.dev_class, conn->hcon->dev_class, 3); |
790 | 792 | ||