diff options
author | John W. Linville <linville@tuxdriver.com> | 2011-04-29 15:28:49 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-04-29 15:28:49 -0400 |
commit | dee04cac28b5f8a99e002ec1b2e0a49f3155bda0 (patch) | |
tree | 28901cbdc89676bdfb17f6bbc8d4ff8bbedb2cd1 /net/bluetooth/rfcomm/sock.c | |
parent | ce6cac88a4f1e52a51a31c31562f4da347543147 (diff) | |
parent | 7cbc9bd99542752ff570abca79d0027669a01fb8 (diff) | |
download | kernel_samsung_smdk4412-dee04cac28b5f8a99e002ec1b2e0a49f3155bda0.zip kernel_samsung_smdk4412-dee04cac28b5f8a99e002ec1b2e0a49f3155bda0.tar.gz kernel_samsung_smdk4412-dee04cac28b5f8a99e002ec1b2e0a49f3155bda0.tar.bz2 |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6
Diffstat (limited to 'net/bluetooth/rfcomm/sock.c')
-rw-r--r-- | net/bluetooth/rfcomm/sock.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c index 66cc1f0..386cfaf 100644 --- a/net/bluetooth/rfcomm/sock.c +++ b/net/bluetooth/rfcomm/sock.c @@ -743,6 +743,7 @@ static int rfcomm_sock_getsockopt_old(struct socket *sock, int optname, char __u struct sock *sk = sock->sk; struct sock *l2cap_sk; struct rfcomm_conninfo cinfo; + struct l2cap_conn *conn = l2cap_pi(sk)->chan->conn; int len, err = 0; u32 opt; @@ -787,8 +788,8 @@ static int rfcomm_sock_getsockopt_old(struct socket *sock, int optname, char __u l2cap_sk = rfcomm_pi(sk)->dlc->session->sock->sk; - cinfo.hci_handle = l2cap_pi(l2cap_sk)->conn->hcon->handle; - memcpy(cinfo.dev_class, l2cap_pi(l2cap_sk)->conn->hcon->dev_class, 3); + cinfo.hci_handle = conn->hcon->handle; + memcpy(cinfo.dev_class, conn->hcon->dev_class, 3); len = min_t(unsigned int, len, sizeof(cinfo)); if (copy_to_user(optval, (char *) &cinfo, len)) |