aboutsummaryrefslogtreecommitdiffstats
path: root/net/rxrpc/input.c
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2017-01-05 05:38:33 -0500
committerDavid Howells <dhowells@redhat.com>2017-01-05 05:38:33 -0500
commitb54a134a7de461f804cf0e28331d0a43ee82fb13 (patch)
tree4cf4e55a9ee30e6d9b1ed4804cee3d467e09e56e /net/rxrpc/input.c
parent57ea884b0dcf1e59661955919976ef138ec9cdb0 (diff)
rxrpc: Fix handling of enums-to-string translation in tracing
Fix the way enum values are translated into strings in AF_RXRPC tracepoints. The problem with just doing a lookup in a normal flat array of strings or chars is that external tracing infrastructure can't find it. Rather, TRACE_DEFINE_ENUM must be used. Also sort the enums and string tables to make it easier to keep them in order so that a future patch to __print_symbolic() can be optimised to try a direct lookup into the table first before iterating over it. A couple of _proto() macro calls are removed because they refered to tables that got moved to the tracing infrastructure. The relevant data can be found by way of tracing. Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'net/rxrpc/input.c')
-rw-r--r--net/rxrpc/input.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/net/rxrpc/input.c b/net/rxrpc/input.c
index 1d87b5453ef7..7c2abd85def9 100644
--- a/net/rxrpc/input.c
+++ b/net/rxrpc/input.c
@@ -767,15 +767,6 @@ static void rxrpc_input_ack(struct rxrpc_call *call, struct sk_buff *skb,
767 767
768 trace_rxrpc_rx_ack(call, first_soft_ack, summary.ack_reason, nr_acks); 768 trace_rxrpc_rx_ack(call, first_soft_ack, summary.ack_reason, nr_acks);
769 769
770 _proto("Rx ACK %%%u { m=%hu f=#%u p=#%u s=%%%u r=%s n=%u }",
771 sp->hdr.serial,
772 ntohs(buf.ack.maxSkew),
773 first_soft_ack,
774 ntohl(buf.ack.previousPacket),
775 acked_serial,
776 rxrpc_ack_names[summary.ack_reason],
777 buf.ack.nAcks);
778
779 if (buf.ack.reason == RXRPC_ACK_PING_RESPONSE) 770 if (buf.ack.reason == RXRPC_ACK_PING_RESPONSE)
780 rxrpc_input_ping_response(call, skb->tstamp, acked_serial, 771 rxrpc_input_ping_response(call, skb->tstamp, acked_serial,
781 sp->hdr.serial); 772 sp->hdr.serial);
@@ -931,7 +922,6 @@ static void rxrpc_input_call_packet(struct rxrpc_call *call,
931 break; 922 break;
932 923
933 default: 924 default:
934 _proto("Rx %s %%%u", rxrpc_pkts[sp->hdr.type], sp->hdr.serial);
935 break; 925 break;
936 } 926 }
937 927