Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[people/ms/linux.git] / net / rxrpc / call_event.c

diff --git a/net/rxrpc/call_event.c b/net/rxrpc/call_event.c
index e426f6831aab475246a1a9fb706901c55f31bf17..f8ecad2b730e8850cc1235cd72362c22cd7f6192 100644 (file)
--- a/net/rxrpc/call_event.c
+++ b/net/rxrpc/call_event.c
@@ -406,7 +406,8 @@ recheck_state:
                goto recheck_state;
        }
 
-       if (test_and_clear_bit(RXRPC_CALL_EV_RESEND, &call->events)) {
+       if (test_and_clear_bit(RXRPC_CALL_EV_RESEND, &call->events) &&
+           call->state != RXRPC_CALL_CLIENT_RECV_REPLY) {
                rxrpc_resend(call, now);
                goto recheck_state;
        }