Skip to content

Commit 4fc68c4

Browse files
dhowellsdavem330
authored andcommitted
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: 5d7edbc ("rxrpc: Get rid of the Rx ring") Reported-by: Marc Dionne <[email protected]> Signed-off-by: David Howells <[email protected]> cc: "David S. Miller" <[email protected]> cc: Eric Dumazet <[email protected]> cc: Jakub Kicinski <[email protected]> cc: Paolo Abeni <[email protected]> cc: [email protected] cc: [email protected] Signed-off-by: David S. Miller <[email protected]>
1 parent a460f4a commit 4fc68c4

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

net/rxrpc/call_object.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -545,8 +545,8 @@ void rxrpc_get_call(struct rxrpc_call *call, enum rxrpc_call_trace why)
545545
*/
546546
static void rxrpc_cleanup_ring(struct rxrpc_call *call)
547547
{
548-
skb_queue_purge(&call->recvmsg_queue);
549-
skb_queue_purge(&call->rx_oos_queue);
548+
rxrpc_purge_queue(&call->recvmsg_queue);
549+
rxrpc_purge_queue(&call->rx_oos_queue);
550550
}
551551

552552
/*

0 commit comments

Comments
 (0)