From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 24 Apr 2013 14:54:20 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: v3.10-rc1~66^2~51^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6ed0e321a0aef14a894e26658108bf7e895c36a6;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem
---

6ed0e321a0aef14a894e26658108bf7e895c36a6
diff --cc net/bluetooth/sco.c
index 2c80553,9e62102..373d81e
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@@ -663,9 -698,8 +698,9 @@@ static int sco_sock_recvmsg(struct kioc
  
  	if (sk->sk_state == BT_CONNECT2 &&
  	    test_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags)) {
- 		hci_conn_accept(pi->conn->hcon, 0);
+ 		sco_conn_defer_accept(pi->conn->hcon, 0);
  		sk->sk_state = BT_CONFIG;
 +		msg->msg_namelen = 0;
  
  		release_sock(sk);
  		return 0;