leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rxrpc: Allow errors to be returned from rxrpc_queue_packet()

Browse Source 
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:
Marc Dionne 2019-04-12 16:33:54 +01:00 committed by David S. Miller
parent 4611da30d6
commit 8e8715aaa9
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
net/rxrpc/sendmsg.c
View File

@ -152,12 +152,13 @@ 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 * Queue a DATA packet for transmission, set the resend timeout and send
* packet immediately * 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, struct sk_buff *skb, bool last,
rxrpc_notify_end_tx_t notify_end_tx) rxrpc_notify_end_tx_t notify_end_tx)
{ {
struct rxrpc_skb_priv *sp = rxrpc_skb(skb); struct rxrpc_skb_priv *sp = rxrpc_skb(skb);
unsigned long now; unsigned long now;
@ -250,7 +251,8 @@ static void rxrpc_queue_packet(struct rxrpc_sock *rx, struct rxrpc_call *call,
out: out:
rxrpc_free_skb(skb, rxrpc_skb_tx_freed); 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) if (ret < 0)
goto out; goto out;
rxrpc_queue_packet(rx, call, skb, ret = rxrpc_queue_packet(rx, call, skb,
!msg_data_left(msg) && !more, !msg_data_left(msg) && !more,
notify_end_tx); notify_end_tx);
/* Should check for failure here */
skb = NULL; skb = NULL;
} }
} while (msg_data_left(msg) > 0); } while (msg_data_left(msg) > 0);