1 files changed, 8 insertions, 6 deletions

diff --git a/net/rxrpc/sendmsg.c b/net/rxrpc/sendmsg.c
index 5d3f33ce6d41..6a1547b270fe 100644
--- a/net/rxrpc/sendmsg.c
+++ b/net/rxrpc/sendmsg.c
@@ -176,7 +176,7 @@ static int rxrpc_queue_packet(struct rxrpc_sock *rx, struct rxrpc_call *call,
         skb->tstamp = ktime_get_real();
 
         ix = seq & RXRPC_RXTX_BUFF_MASK;
-        rxrpc_get_skb(skb, rxrpc_skb_tx_got);
+        rxrpc_get_skb(skb, rxrpc_skb_got);
         call->rxtx_annotations[ix] = annotation;
         smp_wmb();
         call->rxtx_buffer[ix] = skb;
@@ -226,6 +226,7 @@ static int rxrpc_queue_packet(struct rxrpc_sock *rx, struct rxrpc_call *call,
                         rxrpc_set_call_completion(call,
                                                   RXRPC_CALL_LOCAL_ERROR,
                                                   0, ret);
+                        rxrpc_notify_socket(call);
                         goto out;
                 }
                 _debug("need instant resend %d", ret);
@@ -247,7 +248,7 @@ static int rxrpc_queue_packet(struct rxrpc_sock *rx, struct rxrpc_call *call,
         }
 
 out:
-        rxrpc_free_skb(skb, rxrpc_skb_tx_freed);
+        rxrpc_free_skb(skb, rxrpc_skb_freed);
         _leave(" = %d", ret);
         return ret;
 }
@@ -288,7 +289,7 @@ static int rxrpc_send_data(struct rxrpc_sock *rx,
 
         skb = call->tx_pending;
         call->tx_pending = NULL;
-        rxrpc_see_skb(skb, rxrpc_skb_tx_seen);
+        rxrpc_see_skb(skb, rxrpc_skb_seen);
 
         copied = 0;
         do {
@@ -335,7 +336,9 @@ static int rxrpc_send_data(struct rxrpc_sock *rx,
                         if (!skb)
                                 goto maybe_error;
 
-                        rxrpc_new_skb(skb, rxrpc_skb_tx_new);
+                        sp = rxrpc_skb(skb);
+                        sp->rx_flags |= RXRPC_SKB_TX_BUFFER;
+                        rxrpc_new_skb(skb, rxrpc_skb_new);
 
                         _debug("ALLOC SEND %p", skb);
 
@@ -345,7 +348,6 @@ static int rxrpc_send_data(struct rxrpc_sock *rx,
                         skb_reserve(skb, call->conn->security_size);
                         skb->len += call->conn->security_size;
 
-                        sp = rxrpc_skb(skb);
                         sp->remain = chunk;
                         if (sp->remain > skb_tailroom(skb))
                                 sp->remain = skb_tailroom(skb);
@@ -438,7 +440,7 @@ out:
         return ret;
 
 call_terminated:
-        rxrpc_free_skb(skb, rxrpc_skb_tx_freed);
+        rxrpc_free_skb(skb, rxrpc_skb_freed);
         _leave(" = %d", call->error);
         return call->error;