From 18a489a28c4ce717519843afcfd4844e112057a4 Mon Sep 17 00:00:00 2001 From: David Miller Date: Thu, 19 May 2011 18:09:00 -0400 Subject: [PATCH] --- yaml --- r: 255690 b: refs/heads/master c: 75fde9ee1bca0c0c004aadaebdedf17370f93f18 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/bluetooth/rfcomm/sock.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2d6a5fb83259..c87650a78419 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 78676a06260a4162b6837a8a2fb954445004ebc2 +refs/heads/master: 75fde9ee1bca0c0c004aadaebdedf17370f93f18 diff --git a/trunk/net/bluetooth/rfcomm/sock.c b/trunk/net/bluetooth/rfcomm/sock.c index 386cfaffd4b7..bcf077cfd73e 100644 --- a/trunk/net/bluetooth/rfcomm/sock.c +++ b/trunk/net/bluetooth/rfcomm/sock.c @@ -741,7 +741,6 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c static int rfcomm_sock_getsockopt_old(struct socket *sock, int optname, char __user *optval, int __user *optlen) { 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; @@ -786,8 +785,6 @@ static int rfcomm_sock_getsockopt_old(struct socket *sock, int optname, char __u break; } - l2cap_sk = rfcomm_pi(sk)->dlc->session->sock->sk; - cinfo.hci_handle = conn->hcon->handle; memcpy(cinfo.dev_class, conn->hcon->dev_class, 3);