diff options
Diffstat (limited to 'net/rxrpc/ar-output.c')
-rw-r--r-- | net/rxrpc/ar-output.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/rxrpc/ar-output.c b/net/rxrpc/ar-output.c index d36fb6e1a29c..51cb10062a8d 100644 --- a/net/rxrpc/ar-output.c +++ b/net/rxrpc/ar-output.c | |||
@@ -110,7 +110,7 @@ static void rxrpc_send_abort(struct rxrpc_call *call, u32 abort_code) | |||
110 | 110 | ||
111 | if (call->state <= RXRPC_CALL_COMPLETE) { | 111 | if (call->state <= RXRPC_CALL_COMPLETE) { |
112 | call->state = RXRPC_CALL_LOCALLY_ABORTED; | 112 | call->state = RXRPC_CALL_LOCALLY_ABORTED; |
113 | call->abort_code = abort_code; | 113 | call->local_abort = abort_code; |
114 | set_bit(RXRPC_CALL_EV_ABORT, &call->events); | 114 | set_bit(RXRPC_CALL_EV_ABORT, &call->events); |
115 | del_timer_sync(&call->resend_timer); | 115 | del_timer_sync(&call->resend_timer); |
116 | del_timer_sync(&call->ack_timer); | 116 | del_timer_sync(&call->ack_timer); |
@@ -663,7 +663,7 @@ static int rxrpc_send_data(struct rxrpc_sock *rx, | |||
663 | size_t pad; | 663 | size_t pad; |
664 | 664 | ||
665 | /* pad out if we're using security */ | 665 | /* pad out if we're using security */ |
666 | if (conn->security) { | 666 | if (conn->security_ix) { |
667 | pad = conn->security_size + skb->mark; | 667 | pad = conn->security_size + skb->mark; |
668 | pad = conn->size_align - pad; | 668 | pad = conn->size_align - pad; |
669 | pad &= conn->size_align - 1; | 669 | pad &= conn->size_align - 1; |
@@ -695,7 +695,7 @@ static int rxrpc_send_data(struct rxrpc_sock *rx, | |||
695 | if (more && seq & 1) | 695 | if (more && seq & 1) |
696 | sp->hdr.flags |= RXRPC_REQUEST_ACK; | 696 | sp->hdr.flags |= RXRPC_REQUEST_ACK; |
697 | 697 | ||
698 | ret = rxrpc_secure_packet( | 698 | ret = conn->security->secure_packet( |
699 | call, skb, skb->mark, | 699 | call, skb, skb->mark, |
700 | skb->head + sizeof(struct rxrpc_wire_header)); | 700 | skb->head + sizeof(struct rxrpc_wire_header)); |
701 | if (ret < 0) | 701 | if (ret < 0) |