]> code.ossystems Code Review - openembedded-core.git/blob
d1d8728027b2921e9f469f8bd8b07db7cadcdf09
[openembedded-core.git] /
1 From 7584cfc04914cb0842a986e9808686858b9c8630 Mon Sep 17 00:00:00 2001
2 From: Michael Jeanson <mjeanson@efficios.com>
3 Date: Mon, 31 Jan 2022 10:47:53 -0500
4 Subject: [PATCH 7/7] fix: net: socket: rename SKB_DROP_REASON_SOCKET_FILTER
5  (v5.17)
6
7 No version check needed since this change is between two RCs, see
8 upstream commit :
9
10   commit 364df53c081d93fcfd6b91085ff2650c7f17b3c7
11   Author: Menglong Dong <imagedong@tencent.com>
12   Date:   Thu Jan 27 17:13:01 2022 +0800
13
14     net: socket: rename SKB_DROP_REASON_SOCKET_FILTER
15
16     Rename SKB_DROP_REASON_SOCKET_FILTER, which is used
17     as the reason of skb drop out of socket filter before
18     it's part of a released kernel. It will be used for
19     more protocols than just TCP in future series.
20
21     Link: https://lore.kernel.org/all/20220127091308.91401-2-imagedong@tencent.com/
22
23 Upstream-Status: Backport [lttng-modules commit 7584cfc04914cb0842a986e9808686858b9c8630]
24
25 Change-Id: I666461a5b541fe9e0bf53ad996ce33237af4bfbb
26 Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
27 Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
28 ---
29  include/instrumentation/events/skb.h | 2 +-
30  1 file changed, 1 insertion(+), 1 deletion(-)
31
32 diff --git a/include/instrumentation/events/skb.h b/include/instrumentation/events/skb.h
33 index c6d7095d..237e54ad 100644
34 --- a/include/instrumentation/events/skb.h
35 +++ b/include/instrumentation/events/skb.h
36 @@ -20,7 +20,7 @@ LTTNG_TRACEPOINT_ENUM(skb_drop_reason,
37                 ctf_enum_value("NO_SOCKET",     SKB_DROP_REASON_NO_SOCKET)
38                 ctf_enum_value("PKT_TOO_SMALL", SKB_DROP_REASON_PKT_TOO_SMALL)
39                 ctf_enum_value("TCP_CSUM",      SKB_DROP_REASON_TCP_CSUM)
40 -               ctf_enum_value("TCP_FILTER",    SKB_DROP_REASON_TCP_FILTER)
41 +               ctf_enum_value("SOCKET_FILTER", SKB_DROP_REASON_SOCKET_FILTER)
42                 ctf_enum_value("UDP_CSUM",      SKB_DROP_REASON_UDP_CSUM)
43                 ctf_enum_value("MAX",           SKB_DROP_REASON_MAX)
44         )
45 -- 
46 2.19.1
47