forked from Minki/linux
rxrpc: Allow errors to be returned from rxrpc_queue_packet()
Change rxrpc_queue_packet()'s signature so that it can return any error code it may encounter when trying to send the packet. This allows the caller to eventually do something in case of error - though it should be noted that the packet has been queued and a resend is scheduled. Signed-off-by: Marc Dionne <marc.dionne@auristor.com> Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
4611da30d6
commit
8e8715aaa9
@ -152,10 +152,11 @@ static void rxrpc_notify_end_tx(struct rxrpc_sock *rx, struct rxrpc_call *call,
|
||||
}
|
||||
|
||||
/*
|
||||
* Queue a DATA packet for transmission, set the resend timeout and send the
|
||||
* packet immediately
|
||||
* Queue a DATA packet for transmission, set the resend timeout and send
|
||||
* the packet immediately. Returns the error from rxrpc_send_data_packet()
|
||||
* in case the caller wants to do something with it.
|
||||
*/
|
||||
static void rxrpc_queue_packet(struct rxrpc_sock *rx, struct rxrpc_call *call,
|
||||
static int rxrpc_queue_packet(struct rxrpc_sock *rx, struct rxrpc_call *call,
|
||||
struct sk_buff *skb, bool last,
|
||||
rxrpc_notify_end_tx_t notify_end_tx)
|
||||
{
|
||||
@ -250,7 +251,8 @@ static void rxrpc_queue_packet(struct rxrpc_sock *rx, struct rxrpc_call *call,
|
||||
|
||||
out:
|
||||
rxrpc_free_skb(skb, rxrpc_skb_tx_freed);
|
||||
_leave("");
|
||||
_leave(" = %d", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
@ -423,9 +425,10 @@ static int rxrpc_send_data(struct rxrpc_sock *rx,
|
||||
if (ret < 0)
|
||||
goto out;
|
||||
|
||||
rxrpc_queue_packet(rx, call, skb,
|
||||
ret = rxrpc_queue_packet(rx, call, skb,
|
||||
!msg_data_left(msg) && !more,
|
||||
notify_end_tx);
|
||||
/* Should check for failure here */
|
||||
skb = NULL;
|
||||
}
|
||||
} while (msg_data_left(msg) > 0);
|
||||
|
Loading…
Reference in New Issue
Block a user