From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 40B1BC432C0 for ; Fri, 22 Nov 2019 11:26:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 18A1720708 for ; Fri, 22 Nov 2019 11:26:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574421968; bh=b3iUeq6i7vf0R43JzFyu9ugI+yVa/N6wfBFwjYHU+Vg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=dyx7obw2VAXk2RryehbF0MxEQ0fJWHYIbFC0FJCjEHCWW0j0jC/r2bKI06Jf3axWC Aw6D9ZNMXeIdI3YijEKp9DAJLEm8WsG7QTNx/5Ccw8IftHboe2MQ4vU1FD4XP8ZdkK DSvUPfC+8dkToQVdgU5fwWSPE2uotUrvZu5F98WU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728211AbfKVKfK (ORCPT ); Fri, 22 Nov 2019 05:35:10 -0500 Received: from mail.kernel.org ([198.145.29.99]:32834 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727602AbfKVKfJ (ORCPT ); Fri, 22 Nov 2019 05:35:09 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 878AE20708; Fri, 22 Nov 2019 10:35:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574418909; bh=b3iUeq6i7vf0R43JzFyu9ugI+yVa/N6wfBFwjYHU+Vg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lJnY+fJ2YYYfyHA5sajhda9MADC+aGNSbEE/cfN70WPlcAG8i3YFAbbjvM38Gclky ZtGTSQI5HKZve3k1jrQi/vcLV6gBzrpXerd7iD0swP8YYlctC6SFN1lIygonrc3vK7 +XFsOFXGCiPmXsAZOLzWZ8Ba7cNBHrStp8VI/LXU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Luiz Augusto von Dentz , Marcel Holtmann , Sasha Levin Subject: [PATCH 4.4 093/159] Bluetooth: L2CAP: Detect if remote is not able to use the whole MPS Date: Fri, 22 Nov 2019 11:28:04 +0100 Message-Id: <20191122100813.999752181@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122100704.194776704@linuxfoundation.org> References: <20191122100704.194776704@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Luiz Augusto von Dentz [ Upstream commit a5c3021bb62b970713550db3f7fd08aa70665d7e ] If the remote is not able to fully utilize the MPS choosen recalculate the credits based on the actual amount it is sending that way it can still send packets of MTU size without credits dropping to 0. Signed-off-by: Luiz Augusto von Dentz Signed-off-by: Marcel Holtmann Signed-off-by: Sasha Levin --- net/bluetooth/l2cap_core.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index c25f1e4846cde..302c3bacb0247 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -6795,6 +6795,16 @@ static int l2cap_le_data_rcv(struct l2cap_chan *chan, struct sk_buff *skb) chan->sdu_len = sdu_len; chan->sdu_last_frag = skb; + /* Detect if remote is not able to use the selected MPS */ + if (skb->len + L2CAP_SDULEN_SIZE < chan->mps) { + u16 mps_len = skb->len + L2CAP_SDULEN_SIZE; + + /* Adjust the number of credits */ + BT_DBG("chan->mps %u -> %u", chan->mps, mps_len); + chan->mps = mps_len; + l2cap_chan_le_send_credits(chan); + } + return 0; } -- 2.20.1