More fixes

include/trace/events/rxrpc.h

diff --git a/include/trace/events/rxrpc.h b/include/trace/events/rxrpc.h
index dd73a26..562002f 100644
--- a/include/trace/events/rxrpc.h
+++ b/include/trace/events/rxrpc.h
@@ -1276,6 +1276,32 @@ TRACE_EVENT(rxrpc_connect_call,
 		      __entry->call_id)
 	    );
 
+TRACE_EVENT(rxrpc_accept_call,
+	    TP_PROTO(struct rxrpc_call *call),
+
+	    TP_ARGS(call),
+
+	    TP_STRUCT__entry(
+		    __field(unsigned int,		call		)
+		    __field(unsigned long,		user_call_ID	)
+		    __field(u32,			cid		)
+		    __field(u32,			call_id		)
+			     ),
+
+	    TP_fast_assign(
+		    __entry->call = call->debug_id;
+		    __entry->user_call_ID = call->user_call_ID;
+		    __entry->cid = call->cid;
+		    __entry->call_id = call->call_id;
+			   ),
+
+	    TP_printk("c=%08x u=%p %08x:%08x",
+		      __entry->call,
+		      (void *)__entry->user_call_ID,
+		      __entry->cid,
+		      __entry->call_id)
+	    );
+
 TRACE_EVENT(rxrpc_resend,
 	    TP_PROTO(struct rxrpc_call *call, int ix),
 

net/rxrpc/call_accept.c

diff --git a/net/rxrpc/call_accept.c b/net/rxrpc/call_accept.c
index 9253f6b..eb7d27c3 100644
--- a/net/rxrpc/call_accept.c
+++ b/net/rxrpc/call_accept.c
@@ -542,6 +542,7 @@ struct rxrpc_call *rxrpc_new_incoming_call(struct rxrpc_local *local,
 	if (!rcu_access_pointer(call->socket))
 		rcu_assign_pointer(call->socket, b->kernel_sock);
 	rxrpc_incoming_call(call, skb);
+	trace_rxrpc_accept_call(call);
 	conn = call->conn;
 
 	if (b->notify_new_call)

net/rxrpc/call_object.c

diff --git a/net/rxrpc/call_object.c b/net/rxrpc/call_object.c
index 444fbc7..b8ab9b2 100644
--- a/net/rxrpc/call_object.c
+++ b/net/rxrpc/call_object.c
@@ -173,7 +173,7 @@ struct rxrpc_call *rxrpc_alloc_call(struct rxrpc_local *local, gfp_t gfp,
 	rwlock_init(&call->state_lock);
 	call->tx_total_len = -1;
 	call->next_rx_timo = 20 * HZ;
-	call->next_req_timo = 1 * HZ;
+	call->next_req_timo = 10 * HZ;
 
 	memset(&call->sock_node, 0xed, sizeof(call->sock_node));
 

net/rxrpc/proc.c

diff --git a/net/rxrpc/proc.c b/net/rxrpc/proc.c
index 814a6ab..771c310 100644
--- a/net/rxrpc/proc.c
+++ b/net/rxrpc/proc.c
@@ -61,7 +61,7 @@ static int rxrpc_call_seq_show(struct seq_file *seq, void *v)
 			 "Proto Local                                          "
 			 " Remote                                         "
 			 " SvID ConnID   CallID   End Use State    Abort   "
-			 " DebugId  TxSeq    TW RxSeq    RW RxSerial RxTimo\n");
+			 " DebugId  TxSeq    TW RxSeq    RWind RxSerial RxTimo\n");
 		return 0;
 	}
 
@@ -88,7 +88,7 @@ static int rxrpc_call_seq_show(struct seq_file *seq, void *v)
 	rx_hard_ack = READ_ONCE(call->rx_hard_ack);
 	seq_printf(seq,
 		   "UDP   %-47.47s %-47.47s %4x %08x %08x %s %3u"
-		   " %-8.8s %08x %08x %08x %02x %08x %02x %08x %06lx\n",
+		   " %-8.8s %08x %08x %08x %02x %08x %02x/%02x %08x %06lx\n",
 		   lbuff,
 		   rbuff,
 		   call->service_id,
@@ -100,7 +100,8 @@ static int rxrpc_call_seq_show(struct seq_file *seq, void *v)
 		   call->abort_code,
 		   call->debug_id,
 		   tx_hard_ack, READ_ONCE(call->tx_top) - tx_hard_ack,
-		   rx_hard_ack, READ_ONCE(call->rx_top) - rx_hard_ack,
+		   rx_hard_ack,
+		   READ_ONCE(call->rx_top) - rx_hard_ack, call->rx_winsize,
 		   call->rx_serial,
 		   timeout);