diff options
| -rw-r--r-- | net/rxrpc/conn_event.c | 1 | ||||
| -rw-r--r-- | net/rxrpc/input.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/net/rxrpc/conn_event.c b/net/rxrpc/conn_event.c index c1c6b7f305d1..6296374df840 100644 --- a/net/rxrpc/conn_event.c +++ b/net/rxrpc/conn_event.c @@ -42,6 +42,7 @@ static void rxrpc_conn_retransmit(struct rxrpc_connection *conn, } abort; struct { struct rxrpc_ackpacket ack; + u8 padding[3]; struct rxrpc_ackinfo info; }; }; diff --git a/net/rxrpc/input.c b/net/rxrpc/input.c index 66cdeb56f44f..5e683dd21ab9 100644 --- a/net/rxrpc/input.c +++ b/net/rxrpc/input.c @@ -732,7 +732,7 @@ void rxrpc_data_ready(struct sock *sk) /* For the previous service call, if completed * successfully, we discard all further packets. */ - if (rxrpc_conn_is_service(call->conn) && + if (rxrpc_conn_is_service(conn) && (chan->last_type == RXRPC_PACKET_TYPE_ACK || sp->hdr.type == RXRPC_PACKET_TYPE_ABORT)) goto discard_unlock; |