From cef0df2218717a5f0b0536e913998bbaa0599db2 Mon Sep 17 00:00:00 2001
From: Woogeun Lee <woogeun.lee@samsung.com>
Date: Tue, 21 Dec 2021 17:23:11 +0900
Subject: [PATCH] ANDROID: ABI: update allowed list for galaxy

Leaf changes summary: 2 artifacts changed
Changed leaf types summary: 0 leaf type changed
Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 2 Added functions
Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable

2 Added functions:

  [A] 'function void usbnet_cdc_unbind(usbnet*, usb_interface*)'
  [A] 'function int usbnet_generic_cdc_bind(usbnet*, usb_interface*)'

Bug: 211557881

Signed-off-by: Woogeun Lee <woogeun.lee@samsung.com>
Change-Id: Ied606874c2135d514a20831d20642de5c105986a
---
 android/abi_gki_aarch64.xml    | 20 ++++++++++++++++----
 android/abi_gki_aarch64_galaxy |  2 ++
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml
index b5f86b200c48..4d45d46b190a 100644
--- a/android/abi_gki_aarch64.xml
+++ b/android/abi_gki_aarch64.xml
@@ -5320,9 +5320,11 @@
       <elf-symbol name='usb_unregister_notify' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x811dc334'/>
       <elf-symbol name='usb_wakeup_enabled_descendants' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xa8576ad'/>
       <elf-symbol name='usb_wakeup_notification' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x84edb62f'/>
+      <elf-symbol name='usbnet_cdc_unbind' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xd8edf3d6'/>
       <elf-symbol name='usbnet_change_mtu' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x29b080fc'/>
       <elf-symbol name='usbnet_defer_kevent' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x983cd249'/>
       <elf-symbol name='usbnet_disconnect' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xff76f05'/>
+      <elf-symbol name='usbnet_generic_cdc_bind' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x5b3d46dd'/>
       <elf-symbol name='usbnet_get_drvinfo' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xc9eac17c'/>
       <elf-symbol name='usbnet_get_endpoints' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xf4f15b5b'/>
       <elf-symbol name='usbnet_get_link' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xd7a67954'/>
@@ -16980,8 +16982,8 @@
         </data-member>
       </class-decl>
       <function-type size-in-bits='64' id='1c800c47'>
-        <parameter type-id='12884b9a' name='dev'/>
-        <parameter type-id='8bf48c31' name='intf'/>
+        <parameter type-id='12884b9a'/>
+        <parameter type-id='8bf48c31'/>
         <return type-id='48b5725f'/>
       </function-type>
       <class-decl name='iw_statistics' size-in-bits='256' is-struct='yes' visibility='default' filepath='include/uapi/linux/wireless.h' line='881' column='1' id='1c8cc2fd'>
@@ -37790,8 +37792,8 @@
       <pointer-type-def type-id='66f5cf2a' size-in-bits='64' id='53d4e65c'/>
       <pointer-type-def type-id='3bf19710' size-in-bits='64' id='53e3a7d6'/>
       <function-type size-in-bits='64' id='53e8ab6e'>
-        <parameter type-id='12884b9a'/>
-        <parameter type-id='8bf48c31'/>
+        <parameter type-id='12884b9a' name='dev'/>
+        <parameter type-id='8bf48c31' name='intf'/>
         <return type-id='95e97e5e'/>
       </function-type>
       <qualified-type-def type-id='e3913a59' const='yes' id='53ecac3a'/>
@@ -141543,6 +141545,11 @@
         <parameter type-id='f0981eeb' name='portnum' filepath='drivers/usb/core/hub.c' line='696' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
+      <function-decl name='usbnet_cdc_unbind' mangled-name='usbnet_cdc_unbind' filepath='drivers/net/usb/cdc_ether.c' line='345' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_cdc_unbind'>
+        <parameter type-id='12884b9a' name='dev' filepath='drivers/net/usb/cdc_ether.c' line='345' column='1'/>
+        <parameter type-id='8bf48c31' name='intf' filepath='drivers/net/usb/cdc_ether.c' line='345' column='1'/>
+        <return type-id='48b5725f'/>
+      </function-decl>
       <function-decl name='usbnet_change_mtu' mangled-name='usbnet_change_mtu' filepath='drivers/net/usb/usbnet.c' line='375' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_change_mtu'>
         <parameter type-id='68a2d05b' name='net' filepath='drivers/net/usb/usbnet.c' line='375' column='1'/>
         <parameter type-id='95e97e5e' name='new_mtu' filepath='drivers/net/usb/usbnet.c' line='375' column='1'/>
@@ -141557,6 +141564,11 @@
         <parameter type-id='8bf48c31' name='intf' filepath='drivers/net/usb/usbnet.c' line='1567' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
+      <function-decl name='usbnet_generic_cdc_bind' mangled-name='usbnet_generic_cdc_bind' filepath='drivers/net/usb/cdc_ether.c' line='100' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_generic_cdc_bind'>
+        <parameter type-id='12884b9a' name='dev' filepath='drivers/net/usb/cdc_ether.c' line='100' column='1'/>
+        <parameter type-id='8bf48c31' name='intf' filepath='drivers/net/usb/cdc_ether.c' line='100' column='1'/>
+        <return type-id='95e97e5e'/>
+      </function-decl>
       <function-decl name='usbnet_get_drvinfo' mangled-name='usbnet_get_drvinfo' filepath='drivers/net/usb/usbnet.c' line='1020' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_get_drvinfo'>
         <parameter type-id='68a2d05b' name='net' filepath='drivers/net/usb/usbnet.c' line='1020' column='1'/>
         <parameter type-id='8c4c4029' name='info' filepath='drivers/net/usb/usbnet.c' line='1020' column='1'/>
diff --git a/android/abi_gki_aarch64_galaxy b/android/abi_gki_aarch64_galaxy
index 343a40594e66..f8d07776abc9 100644
--- a/android/abi_gki_aarch64_galaxy
+++ b/android/abi_gki_aarch64_galaxy
@@ -4317,9 +4317,11 @@
   usb_unpoison_urb
   usb_unregister_notify
   usb_wakeup_notification
+  usbnet_cdc_unbind
   usbnet_change_mtu
   usbnet_defer_kevent
   usbnet_disconnect
+  usbnet_generic_cdc_bind
   usbnet_get_drvinfo
   usbnet_get_endpoints
   usbnet_get_link