xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6

Browse Source 
Conflicts:
	net/bluetooth/rfcomm/sock.c
This commit is contained in:
Gustavo F. Padovan
2011-06-09 16:33:54 -03:00
parent 5a9d0a3ffb 6de6c18d8d
commit 448f2627c1
5 changed files with 38 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/bluetooth/rfcomm/sock.c
View File

@@ -679,7 +679,8 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
{
struct sock *sk = sock->sk;
struct bt_security sec;
int len, err = 0;
int err = 0;
size_t len;
u32 opt;
BT_DBG("sk %p", sk);
@@ -785,6 +786,7 @@ static int rfcomm_sock_getsockopt_old(struct socket *sock, int optname, char __u
break;
}
memset(&cinfo, 0, sizeof(cinfo));
cinfo.hci_handle = conn->hcon->handle;
memcpy(cinfo.dev_class, conn->hcon->dev_class, 3);