diff options
| author | David S. Miller <davem@davemloft.net> | 2011-06-25 01:21:00 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-25 01:21:00 +0400 |
| commit | cd5f3e2064ea21e1cbe140728a1b04e7d32f68eb (patch) | |
| tree | c2d924b975bdf6fd294546ffb800116c508878e7 /net/bluetooth/rfcomm/sock.c | |
| parent | 95cb3656c09fcf6577138337216c27744ebc91e2 (diff) | |
| parent | 36099365c7cc64e5184b66b6eb094950a13f540c (diff) | |
| download | linux-cd5f3e2064ea21e1cbe140728a1b04e7d32f68eb.tar.xz | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/bluetooth/rfcomm/sock.c')
| -rw-r--r-- | net/bluetooth/rfcomm/sock.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c index 1b10727ce523..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 { 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); @@ -741,7 +742,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 +786,6 @@ static int rfcomm_sock_getsockopt_old(struct socket *sock, int optname, char __u break; } - l2cap_sk = rfcomm_pi(sk)->dlc->session->sock->sk; - memset(&cinfo, 0, sizeof(cinfo)); cinfo.hci_handle = conn->hcon->handle; memcpy(cinfo.dev_class, conn->hcon->dev_class, 3); |