From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7EBFB1D0429; Wed, 2 Oct 2024 13:21:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727875312; cv=none; b=ujZVzdkjBWYBb3wB5BzI58kCVlX9amwOCEw1LcWi9RZBZrGnly4Zt+Mamu55LU2746rPAMFAdYcsVNSS/k0RqVxgO6oRtgANjeC3MMMkh6UExdhILnNg9iEJq4ctvR+J7lPvxu8svQSl/05Bcf0WyMD+Gu1/ZHyqygGbjWr446Q= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727875312; c=relaxed/simple; bh=1OoZxvt91s0uM2S+i3BzE1ZqdS7CSSiFsAsRa/UfGwc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FgpL3Ax9zfZRsg+TiMGBbv2qrZ0HrSj76dTKIq93tbuuXEez5/yBIPqXsebAk+P2GE2ur8FAio0I7vlv4XpWWvxAkYW5rAuQaiZKqzPbBEajy6igPUCZBg6ah1ncnJh4lAVO7RRREfJt+BDfE1I/XYVdRlfj991GELyJPt0pW9Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=OJsI3LTO; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="OJsI3LTO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 09802C4CEC5; Wed, 2 Oct 2024 13:21:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1727875312; bh=1OoZxvt91s0uM2S+i3BzE1ZqdS7CSSiFsAsRa/UfGwc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OJsI3LTOnNP7lJ7vEwCTtPqjrpo95GcsYITyrypzrdtXJ9kNXLDleP3thePbEaeM8 tbMorOfTx7D7p6YlnJYKfe2A5s7iSphp+Tgxi/wOvAnSgkC7ExQW2N99FdfkyLH3H/ Ob33W6d3V85g62Vzh/QYXpvyZSyd4kOTs8zKc4vs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Zhang Changzhong , Oleksij Rempel , Marc Kleine-Budde , Sasha Levin Subject: [PATCH 6.11 060/695] can: j1939: use correct function name in comment Date: Wed, 2 Oct 2024 14:50:58 +0200 Message-ID: <20241002125824.881598370@linuxfoundation.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241002125822.467776898@linuxfoundation.org> References: <20241002125822.467776898@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.11-stable review patch. If anyone has any objections, please let me know. ------------------ From: Zhang Changzhong [ Upstream commit dc2ddcd136fe9b6196a7dd01f75f824beb02d43f ] The function j1939_cancel_all_active_sessions() was renamed to j1939_cancel_active_session() but name in comment wasn't updated. Signed-off-by: Zhang Changzhong Acked-by: Oleksij Rempel Fixes: 9d71dd0c7009 ("can: add support of SAE J1939 protocol") Link: https://patch.msgid.link/1724935703-44621-1-git-send-email-zhangchangzhong@huawei.com Signed-off-by: Marc Kleine-Budde Signed-off-by: Sasha Levin --- net/can/j1939/transport.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/can/j1939/transport.c b/net/can/j1939/transport.c index 4be73de5033cb..319f47df33300 100644 --- a/net/can/j1939/transport.c +++ b/net/can/j1939/transport.c @@ -1179,10 +1179,10 @@ static enum hrtimer_restart j1939_tp_txtimer(struct hrtimer *hrtimer) break; case -ENETDOWN: /* In this case we should get a netdev_event(), all active - * sessions will be cleared by - * j1939_cancel_all_active_sessions(). So handle this as an - * error, but let j1939_cancel_all_active_sessions() do the - * cleanup including propagation of the error to user space. + * sessions will be cleared by j1939_cancel_active_session(). + * So handle this as an error, but let + * j1939_cancel_active_session() do the cleanup including + * propagation of the error to user space. */ break; case -EOVERFLOW: -- 2.43.0