From bd0308e36bc88b6545bef421d3299b3c6e4d50c0 Mon Sep 17 00:00:00 2001
From: Wei Liu <liuwei.a@oppo.com>
Date: Mon, 28 Aug 2023 14:30:14 +0800
Subject: [PATCH] ANDROID: GKI: Update symbols to symbol list

Update symbols to symbol list externed by oppo network group.

5 Added function:

  [A] 'function int __rtnl_link_register(rtnl_link_ops*)'
  [A] 'function int ip_local_deliver(struct sk_buff *)'
  [A] 'function iov_iter_advance(struct iov_iter *i, size_t size)'
  [A] 'function int nf_register_net_hook(struct net *net,
					 const struct nf_hook_ops *reg)'
  [A] 'function void nf_unregister_net_hook(struct net *,
					    const struct nf_hook_ops *)'

These functions have been merged in lower versions of the kernel and are still needed by oppo in higher versions.

These functions are needed by other modules that provide functionality for oppo's network, such as the network tracking module, the network warm-up module, etc.

Bug: 297979024

Change-Id: Ic1a4c869b3894a06f7cab7b5120574ed94d519b2
Signed-off-by: Wei Liu <liuwei.a@oppo.com>
---
 android/abi_gki_aarch64.stg   | 62 +++++++++++++++++++++++++++++++++++
 android/abi_gki_aarch64_oplus |  5 +++
 2 files changed, 67 insertions(+)

diff --git a/android/abi_gki_aarch64.stg b/android/abi_gki_aarch64.stg
index 710bf35a109b..e23c331b66f9 100644
--- a/android/abi_gki_aarch64.stg
+++ b/android/abi_gki_aarch64.stg
@@ -285031,6 +285031,12 @@ function {
   parameter_id: 0x09427c40
   parameter_id: 0x6d7f5ff6
 }
+function {
+  id: 0x137f5862
+  return_type_id: 0x48b5725f
+  parameter_id: 0x0ca27481
+  parameter_id: 0x33e53462
+}
 function {
   id: 0x1382dd85
   return_type_id: 0x48b5725f
@@ -317411,6 +317417,12 @@ function {
   parameter_id: 0x33b77109
   parameter_id: 0x0277bf8a
 }
+function {
+  id: 0x9e67eade
+  return_type_id: 0x6720d32f
+  parameter_id: 0x0ca27481
+  parameter_id: 0x33e53462
+}
 function {
   id: 0x9e68eb19
   return_type_id: 0x6720d32f
@@ -326680,6 +326692,15 @@ elf_symbol {
   type_id: 0x1dbb54c5
   full_name: "__rt_mutex_init"
 }
+elf_symbol {
+  id: 0x31b4eed9
+  name: "__rtnl_link_unregister"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x139f3c01
+  type_id: 0x1cd366b4
+  full_name: "__rtnl_link_unregister"
+}
 elf_symbol {
   id: 0x99aa632e
   name: "__sbitmap_queue_get"
@@ -355255,6 +355276,15 @@ elf_symbol {
   type_id: 0x1a5fed1b
   full_name: "iounmap"
 }
+elf_symbol {
+  id: 0x382b3272
+  name: "iov_iter_advance"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x4a850157
+  type_id: 0x189472bc
+  full_name: "iov_iter_advance"
+}
 elf_symbol {
   id: 0x71726a83
   name: "iov_iter_init"
@@ -355345,6 +355375,15 @@ elf_symbol {
   type_id: 0x1557244f
   full_name: "ip_compute_csum"
 }
+elf_symbol {
+  id: 0x333700e4
+  name: "ip_local_deliver"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x20dcb3a1
+  type_id: 0x9cd33969
+  full_name: "ip_local_deliver"
+}
 elf_symbol {
   id: 0x5234b1b5
   name: "ip_local_out"
@@ -360904,6 +360943,15 @@ elf_symbol {
   type_id: 0xfebe0504
   full_name: "nf_ct_invert_tuple"
 }
+elf_symbol {
+  id: 0x8b1dfb41
+  name: "nf_register_net_hook"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0x10b94e6c
+  type_id: 0x9e67eade
+  full_name: "nf_register_net_hook"
+}
 elf_symbol {
   id: 0x43078d96
   name: "nf_register_net_hooks"
@@ -360913,6 +360961,15 @@ elf_symbol {
   type_id: 0x9e768b87
   full_name: "nf_register_net_hooks"
 }
+elf_symbol {
+  id: 0x840dad92
+  name: "nf_unregister_net_hook"
+  is_defined: true
+  symbol_type: FUNCTION
+  crc: 0xd4486d5d
+  type_id: 0x137f5862
+  full_name: "nf_unregister_net_hook"
+}
 elf_symbol {
   id: 0x619db28f
   name: "nf_unregister_net_hooks"
@@ -385856,6 +385913,7 @@ interface {
   symbol_id: 0x2b453adc
   symbol_id: 0xd5276fa4
   symbol_id: 0x98379aaf
+  symbol_id: 0x31b4eed9
   symbol_id: 0x99aa632e
   symbol_id: 0xe68925b8
   symbol_id: 0x6e3bb1cf
@@ -389030,6 +389088,7 @@ interface {
   symbol_id: 0x42137268
   symbol_id: 0xa0390871
   symbol_id: 0xfb789e26
+  symbol_id: 0x382b3272
   symbol_id: 0x71726a83
   symbol_id: 0xffb394c4
   symbol_id: 0x48a6183b
@@ -389040,6 +389099,7 @@ interface {
   symbol_id: 0x7837fb7f
   symbol_id: 0x807f9d22
   symbol_id: 0x6cd920cf
+  symbol_id: 0x333700e4
   symbol_id: 0x5234b1b5
   symbol_id: 0xaed020d7
   symbol_id: 0xc1d5ac06
@@ -389658,7 +389718,9 @@ interface {
   symbol_id: 0xb4e99805
   symbol_id: 0x471faa17
   symbol_id: 0x82e37620
+  symbol_id: 0x8b1dfb41
   symbol_id: 0x43078d96
+  symbol_id: 0x840dad92
   symbol_id: 0x619db28f
   symbol_id: 0x36bc8d13
   symbol_id: 0x38637341
diff --git a/android/abi_gki_aarch64_oplus b/android/abi_gki_aarch64_oplus
index 51994d0e6fae..63e48209f547 100644
--- a/android/abi_gki_aarch64_oplus
+++ b/android/abi_gki_aarch64_oplus
@@ -32,10 +32,12 @@
   iio_channel_get
   iio_channel_release
   iio_get_channel_type
+  ip_local_deliver
   ip6_local_out
   ip6_route_me_harder
   ip_route_me_harder
   ipv6_find_hdr
+  iov_iter_advance
   is_ashmem_file
   jiffies_64_to_clock_t
   kick_process
@@ -47,7 +49,9 @@
   mmc_wait_for_cmd
   nf_ct_attach
   nf_ct_delete
+  nf_register_net_hook
   nf_register_net_hooks
+  nf_unregister_net_hook
   nf_unregister_net_hooks
   nr_running
   of_css
@@ -67,6 +71,7 @@
   remove_proc_subtree
   rtc_read_alarm
   rtc_set_alarm
+  __rtnl_link_unregister
   sdio_memcpy_fromio
   sdio_memcpy_toio
   sdio_set_block_size