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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 6228EC3A59F for ; Thu, 29 Aug 2019 18:17:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 316EA2341B for ; Thu, 29 Aug 2019 18:17:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567102628; bh=kGDX4XP3su5dRLtJHSDHm31PWwTm4z04DYHTcLsWqDk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ODCewECVqp7tFnH9sYBdH/JLOmPfPYHsTjW5IxqXUTGFsof6J678pw7imQGOWxgFu dVScXKnm+NzXzcM8WnCmzA9njDFvYZjY7tamJdeCGzZcOPna7XMwC0OqFRVIYkfZLi HlLIYPcvw19pVMAgK6X5GVF1XO6etaQEegnaYDQU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729962AbfH2SRF (ORCPT ); Thu, 29 Aug 2019 14:17:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:59176 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729945AbfH2SRF (ORCPT ); Thu, 29 Aug 2019 14:17:05 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8AB102339E; Thu, 29 Aug 2019 18:17:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567102624; bh=kGDX4XP3su5dRLtJHSDHm31PWwTm4z04DYHTcLsWqDk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WKZEssMieq3+UIB1G+0iXIWYzNnocGzZFx77CLYGZ5QLzAtIXCBQPzTqidSplZU+B zh338brhZQfxFy8ccmBH0vj1KJ+knvqT3wPebXTFQS6g5fpBqw6wf8UF23DtOHVexe AY13DJkIZO+HMG4xfki/VvbWdP102j+Q3OxEzX6s= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Fabian Henneke , Marcel Holtmann , Sasha Levin , linux-bluetooth@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 05/27] Bluetooth: hidp: Let hidp_send_message return number of queued bytes Date: Thu, 29 Aug 2019 14:16:31 -0400 Message-Id: <20190829181655.8741-5-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190829181655.8741-1-sashal@kernel.org> References: <20190829181655.8741-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Fabian Henneke [ Upstream commit 48d9cc9d85dde37c87abb7ac9bbec6598ba44b56 ] Let hidp_send_message return the number of successfully queued bytes instead of an unconditional 0. With the return value fixed to 0, other drivers relying on hidp, such as hidraw, can not return meaningful values from their respective implementations of write(). In particular, with the current behavior, a hidraw device's write() will have different return values depending on whether the device is connected via USB or Bluetooth, which makes it harder to abstract away the transport layer. Signed-off-by: Fabian Henneke Signed-off-by: Marcel Holtmann Signed-off-by: Sasha Levin --- net/bluetooth/hidp/core.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c index b21fcc838784d..f6bffb3a95116 100644 --- a/net/bluetooth/hidp/core.c +++ b/net/bluetooth/hidp/core.c @@ -101,6 +101,7 @@ static int hidp_send_message(struct hidp_session *session, struct socket *sock, { struct sk_buff *skb; struct sock *sk = sock->sk; + int ret; BT_DBG("session %p data %p size %d", session, data, size); @@ -114,13 +115,17 @@ static int hidp_send_message(struct hidp_session *session, struct socket *sock, } skb_put_u8(skb, hdr); - if (data && size > 0) + if (data && size > 0) { skb_put_data(skb, data, size); + ret = size; + } else { + ret = 0; + } skb_queue_tail(transmit, skb); wake_up_interruptible(sk_sleep(sk)); - return 0; + return ret; } static int hidp_send_ctrl_message(struct hidp_session *session, -- 2.20.1