xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

Browse Source 
Conflicts:
	net/mac80211/sta_info.c
	net/wireless/core.h
This commit is contained in:
John W. Linville
2013-03-29 16:41:36 -04:00
parent 689b66cb53 2e1253d640
commit 9a574cd67a
34 changed files with 473 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
net/bluetooth/sco.c
View File

@@ -359,6 +359,7 @@ static void __sco_sock_close(struct sock *sk)
sco_chan_del(sk, ECONNRESET);
break;
case BT_CONNECT2:
case BT_CONNECT:
case BT_DISCONN:
sco_chan_del(sk, ECONNRESET);