diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml
index 1ef1666a0e50..16fcde74d857 100644
--- a/android/abi_gki_aarch64.xml
+++ b/android/abi_gki_aarch64.xml
@@ -1789,6 +1789,7 @@
       <elf-symbol name='ieee80211_stop_tx_ba_cb_irqsafe' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xf780e33'/>
       <elf-symbol name='ieee80211_tdls_oper_request' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xcf38a065'/>
       <elf-symbol name='ieee80211_tx_dequeue' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xe0798172'/>
+      <elf-symbol name='ieee80211_tx_prepare_skb' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xefb5b420'/>
       <elf-symbol name='ieee80211_tx_rate_update' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x26e2a433'/>
       <elf-symbol name='ieee80211_tx_status' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x4866c846'/>
       <elf-symbol name='ieee80211_tx_status_irqsafe' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xa401f3b5'/>
@@ -32232,6 +32233,7 @@
       <pointer-type-def type-id='8d2ce43f' size-in-bits='64' id='52ab0d0f'/>
       <pointer-type-def type-id='e44b8083' size-in-bits='64' id='52abf1d3'/>
       <pointer-type-def type-id='72c04684' size-in-bits='64' id='52af43ea'/>
+      <pointer-type-def type-id='f27bb1b0' size-in-bits='64' id='52b8956e'/>
       <pointer-type-def type-id='e09a048e' size-in-bits='64' id='52baee64'/>
       <class-decl name='attribute_container' size-in-bits='768' is-struct='yes' visibility='default' filepath='include/linux/attribute_container.h' line='16' column='1' id='52bea74f'>
         <data-member access='public' layout-offset-in-bits='0'>
@@ -105265,11 +105267,11 @@
         <parameter type-id='3eb7c31c' name='gfp' filepath='net/wireless/nl80211.c' line='10283' column='1'/>
         <return type-id='0fbf3cfd'/>
       </function-decl>
-      <function-decl name='__cfg80211_alloc_reply_skb' mangled-name='__cfg80211_alloc_reply_skb' filepath='net/wireless/nl80211.c' line='13799' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cfg80211_alloc_reply_skb'>
-        <parameter type-id='666fb412' name='wiphy' filepath='net/wireless/nl80211.c' line='13799' column='1'/>
-        <parameter type-id='187e1e49' name='cmd' filepath='net/wireless/nl80211.c' line='13800' column='1'/>
-        <parameter type-id='320b0ded' name='attr' filepath='net/wireless/nl80211.c' line='13801' column='1'/>
-        <parameter type-id='95e97e5e' name='approxlen' filepath='net/wireless/nl80211.c' line='13802' column='1'/>
+      <function-decl name='__cfg80211_alloc_reply_skb' mangled-name='__cfg80211_alloc_reply_skb' filepath='net/wireless/nl80211.c' line='13811' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cfg80211_alloc_reply_skb'>
+        <parameter type-id='666fb412' name='wiphy' filepath='net/wireless/nl80211.c' line='13811' column='1'/>
+        <parameter type-id='187e1e49' name='cmd' filepath='net/wireless/nl80211.c' line='13812' column='1'/>
+        <parameter type-id='320b0ded' name='attr' filepath='net/wireless/nl80211.c' line='13813' column='1'/>
+        <parameter type-id='95e97e5e' name='approxlen' filepath='net/wireless/nl80211.c' line='13814' column='1'/>
         <return type-id='0fbf3cfd'/>
       </function-decl>
       <function-decl name='__cfg80211_send_event_skb' mangled-name='__cfg80211_send_event_skb' filepath='net/wireless/nl80211.c' line='10310' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__cfg80211_send_event_skb'>
@@ -108497,9 +108499,9 @@
         <parameter type-id='185e765a' name='rate' filepath='net/wireless/util.c' line='1402' column='1'/>
         <return type-id='19c2251e'/>
       </function-decl>
-      <function-decl name='cfg80211_ch_switch_notify' mangled-name='cfg80211_ch_switch_notify' filepath='net/wireless/nl80211.c' line='17113' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_ch_switch_notify'>
-        <parameter type-id='68a2d05b' name='dev' filepath='net/wireless/nl80211.c' line='17113' column='1'/>
-        <parameter type-id='0953fbfe' name='chandef' filepath='net/wireless/nl80211.c' line='17114' column='1'/>
+      <function-decl name='cfg80211_ch_switch_notify' mangled-name='cfg80211_ch_switch_notify' filepath='net/wireless/nl80211.c' line='17125' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_ch_switch_notify'>
+        <parameter type-id='68a2d05b' name='dev' filepath='net/wireless/nl80211.c' line='17125' column='1'/>
+        <parameter type-id='0953fbfe' name='chandef' filepath='net/wireless/nl80211.c' line='17126' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
       <function-decl name='cfg80211_chandef_create' mangled-name='cfg80211_chandef_create' filepath='net/wireless/chan.c' line='23' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_chandef_create'>
@@ -108514,11 +108516,11 @@
         <parameter type-id='3eb7c31c' name='gfp' filepath='net/wireless/sme.c' line='791' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
-      <function-decl name='cfg80211_del_sta_sinfo' mangled-name='cfg80211_del_sta_sinfo' filepath='net/wireless/nl80211.c' line='16485' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_del_sta_sinfo'>
-        <parameter type-id='68a2d05b' name='dev' filepath='net/wireless/nl80211.c' line='16485' column='1'/>
-        <parameter type-id='bbaf3419' name='mac_addr' filepath='net/wireless/nl80211.c' line='16485' column='1'/>
-        <parameter type-id='7af1dc96' name='sinfo' filepath='net/wireless/nl80211.c' line='16486' column='1'/>
-        <parameter type-id='3eb7c31c' name='gfp' filepath='net/wireless/nl80211.c' line='16486' column='1'/>
+      <function-decl name='cfg80211_del_sta_sinfo' mangled-name='cfg80211_del_sta_sinfo' filepath='net/wireless/nl80211.c' line='16497' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_del_sta_sinfo'>
+        <parameter type-id='68a2d05b' name='dev' filepath='net/wireless/nl80211.c' line='16497' column='1'/>
+        <parameter type-id='bbaf3419' name='mac_addr' filepath='net/wireless/nl80211.c' line='16497' column='1'/>
+        <parameter type-id='7af1dc96' name='sinfo' filepath='net/wireless/nl80211.c' line='16498' column='1'/>
+        <parameter type-id='3eb7c31c' name='gfp' filepath='net/wireless/nl80211.c' line='16498' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
       <function-decl name='cfg80211_disconnected' mangled-name='cfg80211_disconnected' filepath='net/wireless/sme.c' line='1142' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_disconnected'>
@@ -108530,10 +108532,10 @@
         <parameter type-id='3eb7c31c' name='gfp' filepath='net/wireless/sme.c' line='1144' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
-      <function-decl name='cfg80211_external_auth_request' mangled-name='cfg80211_external_auth_request' filepath='net/wireless/nl80211.c' line='17738' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_external_auth_request'>
-        <parameter type-id='68a2d05b' name='dev' filepath='net/wireless/nl80211.c' line='17738' column='1'/>
-        <parameter type-id='2b041d55' name='params' filepath='net/wireless/nl80211.c' line='17739' column='1'/>
-        <parameter type-id='3eb7c31c' name='gfp' filepath='net/wireless/nl80211.c' line='17740' column='1'/>
+      <function-decl name='cfg80211_external_auth_request' mangled-name='cfg80211_external_auth_request' filepath='net/wireless/nl80211.c' line='17750' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_external_auth_request'>
+        <parameter type-id='68a2d05b' name='dev' filepath='net/wireless/nl80211.c' line='17750' column='1'/>
+        <parameter type-id='2b041d55' name='params' filepath='net/wireless/nl80211.c' line='17751' column='1'/>
+        <parameter type-id='3eb7c31c' name='gfp' filepath='net/wireless/nl80211.c' line='17752' column='1'/>
         <return type-id='95e97e5e'/>
       </function-decl>
       <function-decl name='cfg80211_find_elem_match' mangled-name='cfg80211_find_elem_match' filepath='net/wireless/scan.c' line='1216' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_find_elem_match'>
@@ -108562,11 +108564,11 @@
         <parameter type-id='d2b455cb' name='privacy' filepath='net/wireless/scan.c' line='1417' column='1'/>
         <return type-id='bda81d86'/>
       </function-decl>
-      <function-decl name='cfg80211_gtk_rekey_notify' mangled-name='cfg80211_gtk_rekey_notify' filepath='net/wireless/nl80211.c' line='17004' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_gtk_rekey_notify'>
-        <parameter type-id='68a2d05b' name='dev' filepath='net/wireless/nl80211.c' line='17004' column='1'/>
-        <parameter type-id='bbaf3419' name='bssid' filepath='net/wireless/nl80211.c' line='17004' column='1'/>
-        <parameter type-id='bbaf3419' name='replay_ctr' filepath='net/wireless/nl80211.c' line='17005' column='1'/>
-        <parameter type-id='3eb7c31c' name='gfp' filepath='net/wireless/nl80211.c' line='17005' column='1'/>
+      <function-decl name='cfg80211_gtk_rekey_notify' mangled-name='cfg80211_gtk_rekey_notify' filepath='net/wireless/nl80211.c' line='17016' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_gtk_rekey_notify'>
+        <parameter type-id='68a2d05b' name='dev' filepath='net/wireless/nl80211.c' line='17016' column='1'/>
+        <parameter type-id='bbaf3419' name='bssid' filepath='net/wireless/nl80211.c' line='17016' column='1'/>
+        <parameter type-id='bbaf3419' name='replay_ctr' filepath='net/wireless/nl80211.c' line='17017' column='1'/>
+        <parameter type-id='3eb7c31c' name='gfp' filepath='net/wireless/nl80211.c' line='17017' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
       <function-decl name='cfg80211_ibss_joined' mangled-name='cfg80211_ibss_joined' filepath='net/wireless/ibss.c' line='59' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_ibss_joined'>
@@ -108597,13 +108599,13 @@
         <parameter type-id='3eb7c31c' name='gfp' filepath='net/wireless/scan.c' line='2428' column='1'/>
         <return type-id='bda81d86'/>
       </function-decl>
-      <function-decl name='cfg80211_mgmt_tx_status' mangled-name='cfg80211_mgmt_tx_status' filepath='net/wireless/nl80211.c' line='16725' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_mgmt_tx_status'>
-        <parameter type-id='63c7e8e1' name='wdev' filepath='net/wireless/nl80211.c' line='16725' column='1'/>
-        <parameter type-id='91ce1af9' name='cookie' filepath='net/wireless/nl80211.c' line='16725' column='1'/>
-        <parameter type-id='bbaf3419' name='buf' filepath='net/wireless/nl80211.c' line='16726' column='1'/>
-        <parameter type-id='b59d7dce' name='len' filepath='net/wireless/nl80211.c' line='16726' column='1'/>
-        <parameter type-id='b50a4934' name='ack' filepath='net/wireless/nl80211.c' line='16726' column='1'/>
-        <parameter type-id='3eb7c31c' name='gfp' filepath='net/wireless/nl80211.c' line='16726' column='1'/>
+      <function-decl name='cfg80211_mgmt_tx_status' mangled-name='cfg80211_mgmt_tx_status' filepath='net/wireless/nl80211.c' line='16737' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_mgmt_tx_status'>
+        <parameter type-id='63c7e8e1' name='wdev' filepath='net/wireless/nl80211.c' line='16737' column='1'/>
+        <parameter type-id='91ce1af9' name='cookie' filepath='net/wireless/nl80211.c' line='16737' column='1'/>
+        <parameter type-id='bbaf3419' name='buf' filepath='net/wireless/nl80211.c' line='16738' column='1'/>
+        <parameter type-id='b59d7dce' name='len' filepath='net/wireless/nl80211.c' line='16738' column='1'/>
+        <parameter type-id='b50a4934' name='ack' filepath='net/wireless/nl80211.c' line='16738' column='1'/>
+        <parameter type-id='3eb7c31c' name='gfp' filepath='net/wireless/nl80211.c' line='16738' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
       <function-decl name='cfg80211_michael_mic_failure' mangled-name='cfg80211_michael_mic_failure' filepath='net/wireless/mlme.c' line='202' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_michael_mic_failure'>
@@ -108615,19 +108617,19 @@
         <parameter type-id='3eb7c31c' name='gfp' filepath='net/wireless/mlme.c' line='204' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
-      <function-decl name='cfg80211_new_sta' mangled-name='cfg80211_new_sta' filepath='net/wireless/nl80211.c' line='16461' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_new_sta'>
-        <parameter type-id='68a2d05b' name='dev' filepath='net/wireless/nl80211.c' line='16461' column='1'/>
-        <parameter type-id='bbaf3419' name='mac_addr' filepath='net/wireless/nl80211.c' line='16461' column='1'/>
-        <parameter type-id='7af1dc96' name='sinfo' filepath='net/wireless/nl80211.c' line='16462' column='1'/>
-        <parameter type-id='3eb7c31c' name='gfp' filepath='net/wireless/nl80211.c' line='16462' column='1'/>
+      <function-decl name='cfg80211_new_sta' mangled-name='cfg80211_new_sta' filepath='net/wireless/nl80211.c' line='16473' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_new_sta'>
+        <parameter type-id='68a2d05b' name='dev' filepath='net/wireless/nl80211.c' line='16473' column='1'/>
+        <parameter type-id='bbaf3419' name='mac_addr' filepath='net/wireless/nl80211.c' line='16473' column='1'/>
+        <parameter type-id='7af1dc96' name='sinfo' filepath='net/wireless/nl80211.c' line='16474' column='1'/>
+        <parameter type-id='3eb7c31c' name='gfp' filepath='net/wireless/nl80211.c' line='16474' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
-      <function-decl name='cfg80211_pmksa_candidate_notify' mangled-name='cfg80211_pmksa_candidate_notify' filepath='net/wireless/nl80211.c' line='17061' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_pmksa_candidate_notify'>
-        <parameter type-id='68a2d05b' name='dev' filepath='net/wireless/nl80211.c' line='17061' column='1'/>
-        <parameter type-id='95e97e5e' name='index' filepath='net/wireless/nl80211.c' line='17061' column='1'/>
-        <parameter type-id='bbaf3419' name='bssid' filepath='net/wireless/nl80211.c' line='17062' column='1'/>
-        <parameter type-id='b50a4934' name='preauth' filepath='net/wireless/nl80211.c' line='17062' column='1'/>
-        <parameter type-id='3eb7c31c' name='gfp' filepath='net/wireless/nl80211.c' line='17062' column='1'/>
+      <function-decl name='cfg80211_pmksa_candidate_notify' mangled-name='cfg80211_pmksa_candidate_notify' filepath='net/wireless/nl80211.c' line='17073' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_pmksa_candidate_notify'>
+        <parameter type-id='68a2d05b' name='dev' filepath='net/wireless/nl80211.c' line='17073' column='1'/>
+        <parameter type-id='95e97e5e' name='index' filepath='net/wireless/nl80211.c' line='17073' column='1'/>
+        <parameter type-id='bbaf3419' name='bssid' filepath='net/wireless/nl80211.c' line='17074' column='1'/>
+        <parameter type-id='b50a4934' name='preauth' filepath='net/wireless/nl80211.c' line='17074' column='1'/>
+        <parameter type-id='3eb7c31c' name='gfp' filepath='net/wireless/nl80211.c' line='17074' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
       <function-decl name='cfg80211_port_authorized' mangled-name='cfg80211_port_authorized' filepath='net/wireless/sme.c' line='1048' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_port_authorized'>
@@ -108641,19 +108643,19 @@
         <parameter type-id='bda81d86' name='pub' filepath='net/wireless/scan.c' line='2491' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
-      <function-decl name='cfg80211_ready_on_channel' mangled-name='cfg80211_ready_on_channel' filepath='net/wireless/nl80211.c' line='16421' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_ready_on_channel'>
-        <parameter type-id='63c7e8e1' name='wdev' filepath='net/wireless/nl80211.c' line='16421' column='1'/>
-        <parameter type-id='91ce1af9' name='cookie' filepath='net/wireless/nl80211.c' line='16421' column='1'/>
-        <parameter type-id='ec00acfb' name='chan' filepath='net/wireless/nl80211.c' line='16422' column='1'/>
-        <parameter type-id='f0981eeb' name='duration' filepath='net/wireless/nl80211.c' line='16423' column='1'/>
-        <parameter type-id='3eb7c31c' name='gfp' filepath='net/wireless/nl80211.c' line='16423' column='1'/>
+      <function-decl name='cfg80211_ready_on_channel' mangled-name='cfg80211_ready_on_channel' filepath='net/wireless/nl80211.c' line='16433' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_ready_on_channel'>
+        <parameter type-id='63c7e8e1' name='wdev' filepath='net/wireless/nl80211.c' line='16433' column='1'/>
+        <parameter type-id='91ce1af9' name='cookie' filepath='net/wireless/nl80211.c' line='16433' column='1'/>
+        <parameter type-id='ec00acfb' name='chan' filepath='net/wireless/nl80211.c' line='16434' column='1'/>
+        <parameter type-id='f0981eeb' name='duration' filepath='net/wireless/nl80211.c' line='16435' column='1'/>
+        <parameter type-id='3eb7c31c' name='gfp' filepath='net/wireless/nl80211.c' line='16435' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
-      <function-decl name='cfg80211_remain_on_channel_expired' mangled-name='cfg80211_remain_on_channel_expired' filepath='net/wireless/nl80211.c' line='16435' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_remain_on_channel_expired'>
-        <parameter type-id='63c7e8e1' name='wdev' filepath='net/wireless/nl80211.c' line='16435' column='1'/>
-        <parameter type-id='91ce1af9' name='cookie' filepath='net/wireless/nl80211.c' line='16435' column='1'/>
-        <parameter type-id='ec00acfb' name='chan' filepath='net/wireless/nl80211.c' line='16436' column='1'/>
-        <parameter type-id='3eb7c31c' name='gfp' filepath='net/wireless/nl80211.c' line='16437' column='1'/>
+      <function-decl name='cfg80211_remain_on_channel_expired' mangled-name='cfg80211_remain_on_channel_expired' filepath='net/wireless/nl80211.c' line='16447' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_remain_on_channel_expired'>
+        <parameter type-id='63c7e8e1' name='wdev' filepath='net/wireless/nl80211.c' line='16447' column='1'/>
+        <parameter type-id='91ce1af9' name='cookie' filepath='net/wireless/nl80211.c' line='16447' column='1'/>
+        <parameter type-id='ec00acfb' name='chan' filepath='net/wireless/nl80211.c' line='16448' column='1'/>
+        <parameter type-id='3eb7c31c' name='gfp' filepath='net/wireless/nl80211.c' line='16449' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
       <function-decl name='cfg80211_roamed' mangled-name='cfg80211_roamed' filepath='net/wireless/sme.c' line='958' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_roamed'>
@@ -108671,10 +108673,10 @@
         <parameter type-id='19c2251e' name='flags' filepath='net/wireless/mlme.c' line='759' column='1'/>
         <return type-id='b50a4934'/>
       </function-decl>
-      <function-decl name='cfg80211_rx_unprot_mlme_mgmt' mangled-name='cfg80211_rx_unprot_mlme_mgmt' filepath='net/wireless/nl80211.c' line='15949' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_rx_unprot_mlme_mgmt'>
-        <parameter type-id='68a2d05b' name='dev' filepath='net/wireless/nl80211.c' line='15949' column='1'/>
-        <parameter type-id='bbaf3419' name='buf' filepath='net/wireless/nl80211.c' line='15949' column='1'/>
-        <parameter type-id='b59d7dce' name='len' filepath='net/wireless/nl80211.c' line='15950' column='1'/>
+      <function-decl name='cfg80211_rx_unprot_mlme_mgmt' mangled-name='cfg80211_rx_unprot_mlme_mgmt' filepath='net/wireless/nl80211.c' line='15961' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_rx_unprot_mlme_mgmt'>
+        <parameter type-id='68a2d05b' name='dev' filepath='net/wireless/nl80211.c' line='15961' column='1'/>
+        <parameter type-id='bbaf3419' name='buf' filepath='net/wireless/nl80211.c' line='15961' column='1'/>
+        <parameter type-id='b59d7dce' name='len' filepath='net/wireless/nl80211.c' line='15962' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
       <function-decl name='cfg80211_scan_done' mangled-name='cfg80211_scan_done' filepath='net/wireless/scan.c' line='1000' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_scan_done'>
@@ -108703,12 +108705,12 @@
         <parameter type-id='3eb7c31c' name='gfp' filepath='net/wireless/core.c' line='1233' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
-      <function-decl name='cfg80211_tdls_oper_request' mangled-name='cfg80211_tdls_oper_request' filepath='net/wireless/nl80211.c' line='17520' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_tdls_oper_request'>
-        <parameter type-id='68a2d05b' name='dev' filepath='net/wireless/nl80211.c' line='17520' column='1'/>
-        <parameter type-id='bbaf3419' name='peer' filepath='net/wireless/nl80211.c' line='17520' column='1'/>
-        <parameter type-id='ee1b00fc' name='oper' filepath='net/wireless/nl80211.c' line='17521' column='1'/>
-        <parameter type-id='1dc6a898' name='reason_code' filepath='net/wireless/nl80211.c' line='17522' column='1'/>
-        <parameter type-id='3eb7c31c' name='gfp' filepath='net/wireless/nl80211.c' line='17522' column='1'/>
+      <function-decl name='cfg80211_tdls_oper_request' mangled-name='cfg80211_tdls_oper_request' filepath='net/wireless/nl80211.c' line='17532' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_tdls_oper_request'>
+        <parameter type-id='68a2d05b' name='dev' filepath='net/wireless/nl80211.c' line='17532' column='1'/>
+        <parameter type-id='bbaf3419' name='peer' filepath='net/wireless/nl80211.c' line='17532' column='1'/>
+        <parameter type-id='ee1b00fc' name='oper' filepath='net/wireless/nl80211.c' line='17533' column='1'/>
+        <parameter type-id='1dc6a898' name='reason_code' filepath='net/wireless/nl80211.c' line='17534' column='1'/>
+        <parameter type-id='3eb7c31c' name='gfp' filepath='net/wireless/nl80211.c' line='17534' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
       <function-decl name='cfg80211_unlink_bss' mangled-name='cfg80211_unlink_bss' filepath='net/wireless/scan.c' line='2507' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_unlink_bss'>
@@ -108720,14 +108722,14 @@
         <parameter type-id='63c7e8e1' name='wdev' filepath='net/wireless/core.c' line='1141' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
-      <function-decl name='cfg80211_update_owe_info_event' mangled-name='cfg80211_update_owe_info_event' filepath='net/wireless/nl80211.c' line='17779' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_update_owe_info_event'>
-        <parameter type-id='68a2d05b' name='netdev' filepath='net/wireless/nl80211.c' line='17779' column='1'/>
-        <parameter type-id='37104a66' name='owe_info' filepath='net/wireless/nl80211.c' line='17780' column='1'/>
-        <parameter type-id='3eb7c31c' name='gfp' filepath='net/wireless/nl80211.c' line='17781' column='1'/>
+      <function-decl name='cfg80211_update_owe_info_event' mangled-name='cfg80211_update_owe_info_event' filepath='net/wireless/nl80211.c' line='17791' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_update_owe_info_event'>
+        <parameter type-id='68a2d05b' name='netdev' filepath='net/wireless/nl80211.c' line='17791' column='1'/>
+        <parameter type-id='37104a66' name='owe_info' filepath='net/wireless/nl80211.c' line='17792' column='1'/>
+        <parameter type-id='3eb7c31c' name='gfp' filepath='net/wireless/nl80211.c' line='17793' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
-      <function-decl name='cfg80211_vendor_cmd_reply' mangled-name='cfg80211_vendor_cmd_reply' filepath='net/wireless/nl80211.c' line='13816' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_vendor_cmd_reply'>
-        <parameter type-id='0fbf3cfd' name='skb' filepath='net/wireless/nl80211.c' line='13816' column='1'/>
+      <function-decl name='cfg80211_vendor_cmd_reply' mangled-name='cfg80211_vendor_cmd_reply' filepath='net/wireless/nl80211.c' line='13828' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_vendor_cmd_reply'>
+        <parameter type-id='0fbf3cfd' name='skb' filepath='net/wireless/nl80211.c' line='13828' column='1'/>
         <return type-id='95e97e5e'/>
       </function-decl>
       <function-decl name='class_destroy' mangled-name='class_destroy' filepath='drivers/base/class.c' line='261' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='class_destroy'>
@@ -114680,9 +114682,9 @@
         <parameter type-id='80f4b756' name='requested_name' filepath='net/mac80211/main.c' line='529' column='1'/>
         <return type-id='1905517d'/>
       </function-decl>
-      <function-decl name='ieee80211_ap_probereq_get' mangled-name='ieee80211_ap_probereq_get' filepath='net/mac80211/mlme.c' line='2682' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ieee80211_ap_probereq_get'>
-        <parameter type-id='1905517d' name='hw' filepath='net/mac80211/mlme.c' line='2682' column='1'/>
-        <parameter type-id='3a1577c5' name='vif' filepath='net/mac80211/mlme.c' line='2683' column='1'/>
+      <function-decl name='ieee80211_ap_probereq_get' mangled-name='ieee80211_ap_probereq_get' filepath='net/mac80211/mlme.c' line='2683' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ieee80211_ap_probereq_get'>
+        <parameter type-id='1905517d' name='hw' filepath='net/mac80211/mlme.c' line='2683' column='1'/>
+        <parameter type-id='3a1577c5' name='vif' filepath='net/mac80211/mlme.c' line='2684' column='1'/>
         <return type-id='0fbf3cfd'/>
       </function-decl>
       <function-decl name='ieee80211_beacon_cntdwn_is_complete' mangled-name='ieee80211_beacon_cntdwn_is_complete' filepath='net/mac80211/tx.c' line='4702' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ieee80211_beacon_cntdwn_is_complete'>
@@ -114702,8 +114704,8 @@
         <parameter type-id='26d4d46f' name='tim_length' filepath='net/mac80211/tx.c' line='4985' column='1'/>
         <return type-id='0fbf3cfd'/>
       </function-decl>
-      <function-decl name='ieee80211_beacon_loss' mangled-name='ieee80211_beacon_loss' filepath='net/mac80211/mlme.c' line='2809' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ieee80211_beacon_loss'>
-        <parameter type-id='3a1577c5' name='vif' filepath='net/mac80211/mlme.c' line='2809' column='1'/>
+      <function-decl name='ieee80211_beacon_loss' mangled-name='ieee80211_beacon_loss' filepath='net/mac80211/mlme.c' line='2810' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ieee80211_beacon_loss'>
+        <parameter type-id='3a1577c5' name='vif' filepath='net/mac80211/mlme.c' line='2810' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
       <function-decl name='ieee80211_beacon_update_cntdwn' mangled-name='ieee80211_beacon_update_cntdwn' filepath='net/mac80211/tx.c' line='4651' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ieee80211_beacon_update_cntdwn'>
@@ -114720,25 +114722,25 @@
         <parameter type-id='3eaa0294' name='band' filepath='net/wireless/util.c' line='75' column='1'/>
         <return type-id='19c2251e'/>
       </function-decl>
-      <function-decl name='ieee80211_chswitch_done' mangled-name='ieee80211_chswitch_done' filepath='net/mac80211/mlme.c' line='1307' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ieee80211_chswitch_done'>
-        <parameter type-id='3a1577c5' name='vif' filepath='net/mac80211/mlme.c' line='1307' column='1'/>
-        <parameter type-id='b50a4934' name='success' filepath='net/mac80211/mlme.c' line='1307' column='1'/>
+      <function-decl name='ieee80211_chswitch_done' mangled-name='ieee80211_chswitch_done' filepath='net/mac80211/mlme.c' line='1308' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ieee80211_chswitch_done'>
+        <parameter type-id='3a1577c5' name='vif' filepath='net/mac80211/mlme.c' line='1308' column='1'/>
+        <parameter type-id='b50a4934' name='success' filepath='net/mac80211/mlme.c' line='1308' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
-      <function-decl name='ieee80211_connection_loss' mangled-name='ieee80211_connection_loss' filepath='net/mac80211/mlme.c' line='2821' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ieee80211_connection_loss'>
-        <parameter type-id='3a1577c5' name='vif' filepath='net/mac80211/mlme.c' line='2821' column='1'/>
+      <function-decl name='ieee80211_connection_loss' mangled-name='ieee80211_connection_loss' filepath='net/mac80211/mlme.c' line='2822' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ieee80211_connection_loss'>
+        <parameter type-id='3a1577c5' name='vif' filepath='net/mac80211/mlme.c' line='2822' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
-      <function-decl name='ieee80211_cqm_beacon_loss_notify' mangled-name='ieee80211_cqm_beacon_loss_notify' filepath='net/mac80211/mlme.c' line='5942' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ieee80211_cqm_beacon_loss_notify'>
-        <parameter type-id='3a1577c5' name='vif' filepath='net/mac80211/mlme.c' line='5942' column='1'/>
-        <parameter type-id='3eb7c31c' name='gfp' filepath='net/mac80211/mlme.c' line='5942' column='1'/>
+      <function-decl name='ieee80211_cqm_beacon_loss_notify' mangled-name='ieee80211_cqm_beacon_loss_notify' filepath='net/mac80211/mlme.c' line='5950' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ieee80211_cqm_beacon_loss_notify'>
+        <parameter type-id='3a1577c5' name='vif' filepath='net/mac80211/mlme.c' line='5950' column='1'/>
+        <parameter type-id='3eb7c31c' name='gfp' filepath='net/mac80211/mlme.c' line='5950' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
-      <function-decl name='ieee80211_cqm_rssi_notify' mangled-name='ieee80211_cqm_rssi_notify' filepath='net/mac80211/mlme.c' line='5929' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ieee80211_cqm_rssi_notify'>
-        <parameter type-id='3a1577c5' name='vif' filepath='net/mac80211/mlme.c' line='5929' column='1'/>
-        <parameter type-id='b8189423' name='rssi_event' filepath='net/mac80211/mlme.c' line='5930' column='1'/>
-        <parameter type-id='a7832498' name='rssi_level' filepath='net/mac80211/mlme.c' line='5931' column='1'/>
-        <parameter type-id='3eb7c31c' name='gfp' filepath='net/mac80211/mlme.c' line='5932' column='1'/>
+      <function-decl name='ieee80211_cqm_rssi_notify' mangled-name='ieee80211_cqm_rssi_notify' filepath='net/mac80211/mlme.c' line='5937' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ieee80211_cqm_rssi_notify'>
+        <parameter type-id='3a1577c5' name='vif' filepath='net/mac80211/mlme.c' line='5937' column='1'/>
+        <parameter type-id='b8189423' name='rssi_event' filepath='net/mac80211/mlme.c' line='5938' column='1'/>
+        <parameter type-id='a7832498' name='rssi_level' filepath='net/mac80211/mlme.c' line='5939' column='1'/>
+        <parameter type-id='3eb7c31c' name='gfp' filepath='net/mac80211/mlme.c' line='5940' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
       <function-decl name='ieee80211_csa_finish' mangled-name='ieee80211_csa_finish' filepath='net/mac80211/cfg.c' line='3131' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ieee80211_csa_finish'>
@@ -114963,6 +114965,14 @@
         <parameter type-id='cde83d0f' name='txq' filepath='net/mac80211/tx.c' line='3617' column='1'/>
         <return type-id='0fbf3cfd'/>
       </function-decl>
+      <function-decl name='ieee80211_tx_prepare_skb' mangled-name='ieee80211_tx_prepare_skb' filepath='net/mac80211/tx.c' line='1856' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ieee80211_tx_prepare_skb'>
+        <parameter type-id='1905517d' name='hw' filepath='net/mac80211/tx.c' line='1856' column='1'/>
+        <parameter type-id='3a1577c5' name='vif' filepath='net/mac80211/tx.c' line='1857' column='1'/>
+        <parameter type-id='0fbf3cfd' name='skb' filepath='net/mac80211/tx.c' line='1857' column='1'/>
+        <parameter type-id='95e97e5e' name='band' filepath='net/mac80211/tx.c' line='1858' column='1'/>
+        <parameter type-id='52b8956e' name='sta' filepath='net/mac80211/tx.c' line='1858' column='1'/>
+        <return type-id='b50a4934'/>
+      </function-decl>
       <function-decl name='ieee80211_tx_rate_update' mangled-name='ieee80211_tx_rate_update' filepath='net/mac80211/status.c' line='1192' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ieee80211_tx_rate_update'>
         <parameter type-id='1905517d' name='hw' filepath='net/mac80211/status.c' line='1192' column='1'/>
         <parameter type-id='f27bb1b0' name='pubsta' filepath='net/mac80211/status.c' line='1193' column='1'/>
@@ -115182,12 +115192,12 @@
         <parameter type-id='74b427eb' name='dev' filepath='drivers/input/input.c' line='2153' column='1'/>
         <return type-id='95e97e5e'/>
       </function-decl>
-      <function-decl name='input_register_handle' mangled-name='input_register_handle' filepath='drivers/input/input.c' line='2378' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='input_register_handle'>
-        <parameter type-id='bef1b918' name='handle' filepath='drivers/input/input.c' line='2378' column='1'/>
+      <function-decl name='input_register_handle' mangled-name='input_register_handle' filepath='drivers/input/input.c' line='2384' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='input_register_handle'>
+        <parameter type-id='bef1b918' name='handle' filepath='drivers/input/input.c' line='2384' column='1'/>
         <return type-id='95e97e5e'/>
       </function-decl>
-      <function-decl name='input_register_handler' mangled-name='input_register_handler' filepath='drivers/input/input.c' line='2287' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='input_register_handler'>
-        <parameter type-id='4938abae' name='handler' filepath='drivers/input/input.c' line='2287' column='1'/>
+      <function-decl name='input_register_handler' mangled-name='input_register_handler' filepath='drivers/input/input.c' line='2293' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='input_register_handler'>
+        <parameter type-id='4938abae' name='handler' filepath='drivers/input/input.c' line='2293' column='1'/>
         <return type-id='95e97e5e'/>
       </function-decl>
       <function-decl name='input_set_abs_params' mangled-name='input_set_abs_params' filepath='drivers/input/input.c' line='504' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='input_set_abs_params'>
@@ -115210,16 +115220,16 @@
         <parameter type-id='fbc017ef' name='timestamp' filepath='drivers/input/input.c' line='1942' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
-      <function-decl name='input_unregister_device' mangled-name='input_unregister_device' filepath='drivers/input/input.c' line='2260' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='input_unregister_device'>
-        <parameter type-id='74b427eb' name='dev' filepath='drivers/input/input.c' line='2260' column='1'/>
+      <function-decl name='input_unregister_device' mangled-name='input_unregister_device' filepath='drivers/input/input.c' line='2266' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='input_unregister_device'>
+        <parameter type-id='74b427eb' name='dev' filepath='drivers/input/input.c' line='2266' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
-      <function-decl name='input_unregister_handle' mangled-name='input_unregister_handle' filepath='drivers/input/input.c' line='2428' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='input_unregister_handle'>
-        <parameter type-id='bef1b918' name='handle' filepath='drivers/input/input.c' line='2428' column='1'/>
+      <function-decl name='input_unregister_handle' mangled-name='input_unregister_handle' filepath='drivers/input/input.c' line='2434' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='input_unregister_handle'>
+        <parameter type-id='bef1b918' name='handle' filepath='drivers/input/input.c' line='2434' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
-      <function-decl name='input_unregister_handler' mangled-name='input_unregister_handler' filepath='drivers/input/input.c' line='2317' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='input_unregister_handler'>
-        <parameter type-id='4938abae' name='handler' filepath='drivers/input/input.c' line='2317' column='1'/>
+      <function-decl name='input_unregister_handler' mangled-name='input_unregister_handler' filepath='drivers/input/input.c' line='2323' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='input_unregister_handler'>
+        <parameter type-id='4938abae' name='handler' filepath='drivers/input/input.c' line='2323' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
       <function-decl name='int_sqrt' mangled-name='int_sqrt' filepath='lib/math/int_sqrt.c' line='19' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='int_sqrt'>
@@ -116172,8 +116182,8 @@
         <parameter type-id='2aee9912' name='ap' filepath='lib/kasprintf.c' line='15' column='1'/>
         <return type-id='26a90f95'/>
       </function-decl>
-      <function-decl name='kvfree' mangled-name='kvfree' filepath='mm/util.c' line='608' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='kvfree'>
-        <parameter type-id='eaa32e2f' name='addr' filepath='mm/util.c' line='608' column='1'/>
+      <function-decl name='kvfree' mangled-name='kvfree' filepath='mm/util.c' line='610' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='kvfree'>
+        <parameter type-id='eaa32e2f' name='addr' filepath='mm/util.c' line='610' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
       <function-decl name='kvfree_call_rcu' mangled-name='kvfree_call_rcu' filepath='kernel/rcu/tree.c' line='3466' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='kvfree_call_rcu'>
@@ -117042,8 +117052,8 @@
         <parameter type-id='42c8f564' name='sb' filepath='fs/inode.c' line='953' column='1'/>
         <return type-id='7e666abe'/>
       </function-decl>
-      <function-decl name='nf_conntrack_destroy' mangled-name='nf_conntrack_destroy' filepath='net/netfilter/core.c' line='670' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nf_conntrack_destroy'>
-        <parameter type-id='96b07343' name='nfct' filepath='net/netfilter/core.c' line='670' column='1'/>
+      <function-decl name='nf_conntrack_destroy' mangled-name='nf_conntrack_destroy' filepath='net/netfilter/core.c' line='671' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nf_conntrack_destroy'>
+        <parameter type-id='96b07343' name='nfct' filepath='net/netfilter/core.c' line='671' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
       <function-decl name='nla_append' mangled-name='nla_append' filepath='lib/nlattr.c' line='1101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nla_append'>
@@ -117777,8 +117787,8 @@
         <parameter type-id='eaa32e2f' name='addr' filepath='mm/page_alloc.c' line='5341' column='1'/>
         <return type-id='48b5725f'/>
       </function-decl>
-      <function-decl name='page_mapping' mangled-name='page_mapping' filepath='mm/util.c' line='686' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='page_mapping'>
-        <parameter type-id='02f11ed4' name='page' filepath='mm/util.c' line='686' column='1'/>
+      <function-decl name='page_mapping' mangled-name='page_mapping' filepath='mm/util.c' line='688' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='page_mapping'>
+        <parameter type-id='02f11ed4' name='page' filepath='mm/util.c' line='688' column='1'/>
         <return type-id='f57039f0'/>
       </function-decl>
       <function-decl name='panic' mangled-name='panic' filepath='kernel/panic.c' line='177' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='panic'>
diff --git a/android/abi_gki_aarch64_virtual_device b/android/abi_gki_aarch64_virtual_device
index a9dd78485076..932cb8b3520d 100644
--- a/android/abi_gki_aarch64_virtual_device
+++ b/android/abi_gki_aarch64_virtual_device
@@ -634,6 +634,7 @@
   ieee80211_scan_completed
   ieee80211_stop_queues
   ieee80211_stop_tx_ba_cb_irqsafe
+  ieee80211_tx_prepare_skb
   ieee80211_tx_status_irqsafe
   ieee80211_unregister_hw
   ieee80211_wake_queues