rxrpc: Remove call->tx_phase

Remove call->tx_phase as it's only ever set.

Signed-off-by: David Howells <dhowells@redhat.com>
cc: Marc Dionne <marc.dionne@auristor.com>
cc: linux-afs@lists.infradead.org

diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h
index 92f20b6c23cadd293c033f6396083ba598a3c30f..282cb986f8a799a2e634f566aeb199589c2f69de 100644 (file)
--- a/net/rxrpc/ar-internal.h
+++ b/net/rxrpc/ar-internal.h
@@ -678,7 +678,6 @@ struct rxrpc_call {
        rxrpc_serial_t          rx_serial;      /* Highest serial received for this call */
        u8                      rx_winsize;     /* Size of Rx window */
        u8                      tx_winsize;     /* Maximum size of Tx window */
-       bool                    tx_phase;       /* T if transmission phase, F if receive phase */
        u8                      nr_jumbo_bad;   /* Number of jumbo dups/exceeds-windows */
 
        spinlock_t              input_lock;     /* Lock for packet input to this call */

diff --git a/net/rxrpc/call_object.c b/net/rxrpc/call_object.c
index a75861a0c4772077e7b189c6d6e882184efc2320..8290d94e92332f564901cfd243579a6c80163265 100644 (file)
--- a/net/rxrpc/call_object.c
+++ b/net/rxrpc/call_object.c
@@ -206,7 +206,6 @@ static struct rxrpc_call *rxrpc_alloc_client_call(struct rxrpc_sock *rx,
                return ERR_PTR(-ENOMEM);
        call->state = RXRPC_CALL_CLIENT_AWAIT_CONN;
        call->service_id = srx->srx_service;
-       call->tx_phase = true;
        now = ktime_get_real();
        call->acks_latest_ts = now;
        call->cong_tstamp = now;

diff --git a/net/rxrpc/input.c b/net/rxrpc/input.c
index 59a0b8aee2a289e0059d40327278ffe4538dcbf4..0cb23ba79e3b0ba0414c8d3f175c6147f3ff3f00 100644 (file)
--- a/net/rxrpc/input.c
+++ b/net/rxrpc/input.c
@@ -309,10 +309,7 @@ static bool rxrpc_receiving_reply(struct rxrpc_call *call)
                        return false;
                }
        }
-       if (!rxrpc_end_tx_phase(call, true, "ETD"))
-               return false;
-       call->tx_phase = false;
-       return true;
+       return rxrpc_end_tx_phase(call, true, "ETD");
 }
 
 /*

diff --git a/net/rxrpc/recvmsg.c b/net/rxrpc/recvmsg.c
index 7e39c262fd79ef02b7f35ab584fd6a571d5a595b..a378e7a672a8b4cbf59e2ad265cb44bc26e9c965 100644 (file)
--- a/net/rxrpc/recvmsg.c
+++ b/net/rxrpc/recvmsg.c
@@ -203,7 +203,6 @@ static void rxrpc_end_rx_phase(struct rxrpc_call *call, rxrpc_serial_t serial)
                break;
 
        case RXRPC_CALL_SERVER_RECV_REQUEST:
-               call->tx_phase = true;
                call->state = RXRPC_CALL_SERVER_ACK_REQUEST;
                call->expect_req_by = jiffies + MAX_JIFFY_OFFSET;
                write_unlock_bh(&call->state_lock);