Skip to content

Commit a11e6ff

Browse files
committed
rxrpc: Remove call->tx_phase
Remove call->tx_phase as it's only ever set. Signed-off-by: David Howells <[email protected]> cc: Marc Dionne <[email protected]> cc: [email protected]
1 parent 27f699c commit a11e6ff

File tree

4 files changed

+1
-7
lines changed

4 files changed

+1
-7
lines changed

net/rxrpc/ar-internal.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,6 @@ struct rxrpc_call {
678678
rxrpc_serial_t rx_serial; /* Highest serial received for this call */
679679
u8 rx_winsize; /* Size of Rx window */
680680
u8 tx_winsize; /* Maximum size of Tx window */
681-
bool tx_phase; /* T if transmission phase, F if receive phase */
682681
u8 nr_jumbo_bad; /* Number of jumbo dups/exceeds-windows */
683682

684683
spinlock_t input_lock; /* Lock for packet input to this call */

net/rxrpc/call_object.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,6 @@ static struct rxrpc_call *rxrpc_alloc_client_call(struct rxrpc_sock *rx,
206206
return ERR_PTR(-ENOMEM);
207207
call->state = RXRPC_CALL_CLIENT_AWAIT_CONN;
208208
call->service_id = srx->srx_service;
209-
call->tx_phase = true;
210209
now = ktime_get_real();
211210
call->acks_latest_ts = now;
212211
call->cong_tstamp = now;

net/rxrpc/input.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -309,10 +309,7 @@ static bool rxrpc_receiving_reply(struct rxrpc_call *call)
309309
return false;
310310
}
311311
}
312-
if (!rxrpc_end_tx_phase(call, true, "ETD"))
313-
return false;
314-
call->tx_phase = false;
315-
return true;
312+
return rxrpc_end_tx_phase(call, true, "ETD");
316313
}
317314

318315
/*

net/rxrpc/recvmsg.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,6 @@ static void rxrpc_end_rx_phase(struct rxrpc_call *call, rxrpc_serial_t serial)
203203
break;
204204

205205
case RXRPC_CALL_SERVER_RECV_REQUEST:
206-
call->tx_phase = true;
207206
call->state = RXRPC_CALL_SERVER_ACK_REQUEST;
208207
call->expect_req_by = jiffies + MAX_JIFFY_OFFSET;
209208
write_unlock_bh(&call->state_lock);

0 commit comments

Comments
 (0)