diff options
| author | David Howells <dhowells@redhat.com> | 2016-10-06 09:11:49 +0200 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2016-10-06 09:11:49 +0200 |
| commit | 26cb02aa6d3efeb543805ed9ad599dae24f7c6d4 (patch) | |
| tree | 58265f21e206c1249ed4fbbf6e58bd49258879ef /net/rxrpc/call_accept.c | |
| parent | rxrpc: Only ping for lost reply in client call (diff) | |
| download | linux-26cb02aa6d3efeb543805ed9ad599dae24f7c6d4.tar.xz linux-26cb02aa6d3efeb543805ed9ad599dae24f7c6d4.zip | |
rxrpc: Fix warning by splitting rxrpc_send_call_packet()
Split rxrpc_send_data_packet() to separate ACK generation (which is more
complicated) from ABORT generation. This simplifies the code a bit and
fixes the following warning:
In file included from ../net/rxrpc/output.c:20:0:
net/rxrpc/output.c: In function 'rxrpc_send_call_packet':
net/rxrpc/ar-internal.h:1187:27: error: 'top' may be used uninitialized in this function [-Werror=maybe-uninitialized]
net/rxrpc/output.c:103:24: note: 'top' was declared here
net/rxrpc/output.c:225:25: error: 'hard_ack' may be used uninitialized in this function [-Werror=maybe-uninitialized]
Reported-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'net/rxrpc/call_accept.c')
| -rw-r--r-- | net/rxrpc/call_accept.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rxrpc/call_accept.c b/net/rxrpc/call_accept.c index 22cd8a18c481..832d854c2d5c 100644 --- a/net/rxrpc/call_accept.c +++ b/net/rxrpc/call_accept.c @@ -565,7 +565,7 @@ out_discard: write_unlock_bh(&call->state_lock); write_unlock(&rx->call_lock); if (abort) { - rxrpc_send_call_packet(call, RXRPC_PACKET_TYPE_ABORT); + rxrpc_send_abort_packet(call); rxrpc_release_call(rx, call); rxrpc_put_call(call, rxrpc_call_put); } |