diff options
| author | David Howells <dhowells@redhat.com> | 2024-01-05 18:05:41 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2024-01-07 16:25:30 +0100 |
| commit | 4fc68c4c1a114ba597b4f3b082f04622dfa0e0f6 (patch) | |
| tree | d697a5fd9e47698988a36654901164b3622e4012 | |
| parent | mlxbf_gige: Enable the GigE port in mlxbf_gige_open (diff) | |
| download | linux-4fc68c4c1a114ba597b4f3b082f04622dfa0e0f6.tar.xz linux-4fc68c4c1a114ba597b4f3b082f04622dfa0e0f6.zip | |
rxrpc: Fix skbuff cleanup of call's recvmsg_queue and rx_oos_queue
Fix rxrpc_cleanup_ring() to use rxrpc_purge_queue() rather than
skb_queue_purge() so that the count of outstanding skbuffs is correctly
updated when a failed call is cleaned up.
Without this rmmod may hang waiting for rxrpc_n_rx_skbs to become zero.
Fixes: 5d7edbc9231e ("rxrpc: Get rid of the Rx ring")
Reported-by: Marc Dionne <marc.dionne@auristor.com>
Signed-off-by: David Howells <dhowells@redhat.com>
cc: "David S. Miller" <davem@davemloft.net>
cc: Eric Dumazet <edumazet@google.com>
cc: Jakub Kicinski <kuba@kernel.org>
cc: Paolo Abeni <pabeni@redhat.com>
cc: linux-afs@lists.infradead.org
cc: netdev@vger.kernel.org
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/rxrpc/call_object.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/rxrpc/call_object.c b/net/rxrpc/call_object.c index 773eecd1e979..f10b37c14772 100644 --- a/net/rxrpc/call_object.c +++ b/net/rxrpc/call_object.c @@ -545,8 +545,8 @@ void rxrpc_get_call(struct rxrpc_call *call, enum rxrpc_call_trace why) */ static void rxrpc_cleanup_ring(struct rxrpc_call *call) { - skb_queue_purge(&call->recvmsg_queue); - skb_queue_purge(&call->rx_oos_queue); + rxrpc_purge_queue(&call->recvmsg_queue); + rxrpc_purge_queue(&call->rx_oos_queue); } /* |