From 449d8c616f8a6977d85d145ce14362fdbcbf7c06 Mon Sep 17 00:00:00 2001
From: Carlos Llamas <cmllamas@google.com>
Date: Tue, 6 Dec 2022 21:14:55 +0000
Subject: [PATCH] ANDROID: remove leftover includes from revert

The android_vh_kfree_skb tracehook was reverted in commit c1e292ea7c7c
("ANDROID: remove the android_vh_kfree_skb tracehook"), so we don't need
the includes for the trace/hooks/net.h header either as this was added
in the original patch for the tracehook. This aligns with upstream.

Bug: 163716381
Signed-off-by: Carlos Llamas <cmllamas@google.com>
Change-Id: Iebb3d82bb56c6cbbe5abef3fec6e926bd2335d50
---
 net/core/skbuff.c    | 1 -
 net/ipv4/tcp_input.c | 1 -
 2 files changed, 2 deletions(-)

diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 5293ff276e7a..88fa40571d0c 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -79,7 +79,6 @@
 #include <linux/capability.h>
 #include <linux/user_namespace.h>
 #include <linux/indirect_call_wrapper.h>
-#include <trace/hooks/net.h>
 
 #include "dev.h"
 #include "sock_destructor.h"
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index f5107e37ead2..0640453fce54 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -80,7 +80,6 @@
 #include <linux/jump_label_ratelimit.h>
 #include <net/busy_poll.h>
 #include <net/mptcp.h>
-#include <trace/hooks/net.h>
 
 int sysctl_tcp_max_orphans __read_mostly = NR_FILE;