From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Miller Subject: Re: [PATCH net] rxrpc: Fix terminal retransmission connection ID to include the channel Date: Wed, 06 Jun 2018 14:04:34 -0400 (EDT) Message-ID: <20180606.140434.487449157785947369.davem@davemloft.net> References: <152829355456.15682.4887593676960385184.stgit@warthog.procyon.org.uk> Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: netdev@vger.kernel.org, linux-afs@lists.infradead.org, linux-kernel@vger.kernel.org To: dhowells@redhat.com Return-path: In-Reply-To: <152829355456.15682.4887593676960385184.stgit@warthog.procyon.org.uk> Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org From: David Howells Date: Wed, 06 Jun 2018 14:59:14 +0100 > When retransmitting the final ACK or ABORT packet for a call, the cid field > in the packet header is set to the connection's cid, but this is incorrect > as it also needs to include the channel number on that connection that the > call was made on. > > Fix this by OR'ing in the channel number. > > Note that this fixes the bug that: > > commit 1a025028d400b23477341aa7ec2ce55f8b39b554 > rxrpc: Fix handling of call quietly cancelled out on server > > works around. I'm not intending to revert that as it will help protect > against problems that might occur on the server. > > Fixes: 3136ef49a14c ("rxrpc: Delay terminal ACK transmission on a client call") > Signed-off-by: David Howells Applid, thanks David.