Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says: ==================== pull request: bluetooth-next 2020-07-31 Here's the main bluetooth-next pull request for 5.9: - Fix firmware filenames for Marvell chipsets - Several suspend-related fixes - Addedd mgmt commands for runtime configuration - Multiple fixes for Qualcomm-based controllers - Add new monitoring feature for mgmt - Fix handling of legacy cipher (E4) together with security level 4 - Add support for Realtek 8822CE controller - Fix issues with Chinese controllers using fake VID/PID values - Multiple other smaller fixes & improvements ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -479,7 +479,7 @@ static int __rfcomm_dlc_close(struct rfcomm_dlc *d, int err)
|
||||
/* if closing a dlc in a session that hasn't been started,
|
||||
* just close and unlink the dlc
|
||||
*/
|
||||
/* fall through */
|
||||
fallthrough;
|
||||
|
||||
default:
|
||||
rfcomm_dlc_clear_timer(d);
|
||||
|
||||
@@ -218,7 +218,7 @@ static void __rfcomm_sock_close(struct sock *sk)
|
||||
case BT_CONFIG:
|
||||
case BT_CONNECTED:
|
||||
rfcomm_dlc_close(d, 0);
|
||||
/* fall through */
|
||||
fallthrough;
|
||||
|
||||
default:
|
||||
sock_set_flag(sk, SOCK_ZAPPED);
|
||||
|
||||
Reference in New Issue
Block a user