From 7a0b784363acf97a79ce39fda2d831b3d8b97f7d Mon Sep 17 00:00:00 2001 From: Todd Kjos Date: Mon, 2 Nov 2020 15:35:21 -0800 Subject: [PATCH] ANDROID: Fix build-break caused by android_rvh_nf_conn_alloc hook The new android_rvh_nf_conn_alloc hook was not declared properly so kernelci builds break if !CONFIG_ANDROID_VENDOR_HOOKS. Fixes: 01435b2e919b ("ANDROID: GKI: net: add vendor hooks for 'struct nf_conn' lifecycle") Signed-off-by: Todd Kjos Change-Id: I1208dc440836687a9c5621323ff1cf5a5bec862b --- include/trace/hooks/net.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/trace/hooks/net.h b/include/trace/hooks/net.h index 73ae65a10e57..9b69ad26e57b 100644 --- a/include/trace/hooks/net.h +++ b/include/trace/hooks/net.h @@ -34,8 +34,8 @@ DECLARE_RESTRICTED_HOOK(android_rvh_nf_conn_free, #define trace_android_vh_kfree_skb(skb) #define trace_android_rvh_sk_alloc(sock) #define trace_android_rvh_sk_free(sock) -#define trace_android_rvh_sk_alloc(nf_conn) -#define trace_android_rvh_sk_free(nf_conn) +#define trace_android_rvh_nf_conn_alloc(nf_conn) +#define trace_android_rvh_nf_conn_free(nf_conn) #endif #endif /* _TRACE_HOOK_NET_VH_H */ /* This part must be outside protection */