From: Gustavo F. Padovan <padovan@profusion.mobi>
Date: Thu, 9 Jun 2011 19:33:54 +0000 (-0300)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6
X-Git-Tag: v3.1-rc1~316^2~350^2^2~124
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=448f2627c169092d2091a1be22feb6a7775f6201;p=~emulex%2Finfiniband.git

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

Conflicts:
	net/bluetooth/rfcomm/sock.c
---

448f2627c169092d2091a1be22feb6a7775f6201
diff --cc net/bluetooth/rfcomm/sock.c
index bcf077cfd73,5dea4d864ed..8f01e6b11a7
--- a/net/bluetooth/rfcomm/sock.c
+++ b/net/bluetooth/rfcomm/sock.c
@@@ -785,6 -787,9 +786,7 @@@ static int rfcomm_sock_getsockopt_old(s
  			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);