projects
/
platform
/
kernel
/
linux-rpi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rxrpc: Fix response to PING RESPONSE ACKs to a dead call
[platform/kernel/linux-rpi.git]
/
net
/
rxrpc
/
conn_event.c
diff --git
a/net/rxrpc/conn_event.c
b/net/rxrpc/conn_event.c
index
95f4bc2
..
1f251d7
100644
(file)
--- a/
net/rxrpc/conn_event.c
+++ b/
net/rxrpc/conn_event.c
@@
-95,6
+95,14
@@
void rxrpc_conn_retransmit_call(struct rxrpc_connection *conn,
_enter("%d", conn->debug_id);
_enter("%d", conn->debug_id);
+ if (sp && sp->hdr.type == RXRPC_PACKET_TYPE_ACK) {
+ if (skb_copy_bits(skb, sizeof(struct rxrpc_wire_header),
+ &pkt.ack, sizeof(pkt.ack)) < 0)
+ return;
+ if (pkt.ack.reason == RXRPC_ACK_PING_RESPONSE)
+ return;
+ }
+
chan = &conn->channels[channel];
/* If the last call got moved on whilst we were waiting to run, just
chan = &conn->channels[channel];
/* If the last call got moved on whilst we were waiting to run, just
@@
-117,7
+125,7
@@
void rxrpc_conn_retransmit_call(struct rxrpc_connection *conn,
iov[2].iov_base = &ack_info;
iov[2].iov_len = sizeof(ack_info);
iov[2].iov_base = &ack_info;
iov[2].iov_len = sizeof(ack_info);
- serial =
atomic_inc_return(&conn->serial
);
+ serial =
rxrpc_get_next_serial(conn
);
pkt.whdr.epoch = htonl(conn->proto.epoch);
pkt.whdr.cid = htonl(conn->proto.cid | channel);
pkt.whdr.epoch = htonl(conn->proto.epoch);
pkt.whdr.cid = htonl(conn->proto.cid | channel);