Revert "ANDROID: GKI: net: add vendor hooks for 'struct nf_conn' lifecycle"

This reverts commit 4ef54c6ff720c4450318962493f3ee4f7f023896.

The hooks have never been used, so they should be removed.  If they are
needed in the future, they can easily be added back.

Bug: 171013716
Cc: Vignesh Saravanaperumal <vignesh1.s@samsung.com>
Change-Id: I7dbdcc64b3de0d1a8266b09ab9991c212af79043
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

drivers/android/vendor_hooks.c

diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c
index 500bceb..02d62a88 100644
--- a/drivers/android/vendor_hooks.c
+++ b/drivers/android/vendor_hooks.c
@@ -83,8 +83,6 @@
  */
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_sk_alloc);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_sk_free);
-EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_nf_conn_alloc);
-EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_nf_conn_free);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_refrigerator);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_arch_set_freq_scale);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_is_fpsimd_save);

include/trace/hooks/net.h

diff --git a/include/trace/hooks/net.h b/include/trace/hooks/net.h
index e32b24e..9c3e0c3 100644
--- a/include/trace/hooks/net.h
+++ b/include/trace/hooks/net.h
@@ -14,15 +14,10 @@ DECLARE_HOOK(android_vh_ptype_head,
 	TP_PROTO(const struct packet_type *pt, struct list_head *vendor_pt),
 	TP_ARGS(pt, vendor_pt));
 
-struct nf_conn;
 struct sock;
 struct net_device;
 struct msghdr;
 struct sk_buff;
-DECLARE_RESTRICTED_HOOK(android_rvh_nf_conn_alloc,
-	TP_PROTO(struct nf_conn *nf_conn), TP_ARGS(nf_conn), 1);
-DECLARE_RESTRICTED_HOOK(android_rvh_nf_conn_free,
-	TP_PROTO(struct nf_conn *nf_conn), TP_ARGS(nf_conn), 1);
 DECLARE_RESTRICTED_HOOK(android_rvh_sk_alloc,
 	TP_PROTO(struct sock *sock), TP_ARGS(sock), 1);
 DECLARE_RESTRICTED_HOOK(android_rvh_sk_free,

net/netfilter/nf_conntrack_core.c

diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
index 68eb823..002d53d 100644
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -32,7 +32,6 @@
 #include <linux/mm.h>
 #include <linux/nsproxy.h>
 #include <linux/rculist_nulls.h>
-#include <trace/hooks/net.h>
 
 #include <net/netfilter/nf_conntrack.h>
 #include <net/netfilter/nf_conntrack_bpf.h>
@@ -1674,8 +1673,6 @@ __nf_conntrack_alloc(struct net *net,
 
 	nf_ct_zone_add(ct, zone);
 
-	trace_android_rvh_nf_conn_alloc(ct);
-
 	/* Because we use RCU lookups, we set ct_general.use to zero before
 	 * this is inserted in any list.
 	 */
@@ -1721,7 +1718,6 @@ void nf_conntrack_free(struct nf_conn *ct)
 	cnet = nf_ct_pernet(net);
 
 	smp_mb__before_atomic();
-	trace_android_rvh_nf_conn_free(ct);
 	atomic_dec(&cnet->count);
 }
 EXPORT_SYMBOL_GPL(nf_conntrack_free);