diff --git a/android/abi_gki_protected_exports_x86_64 b/android/abi_gki_protected_exports_x86_64
index 84876c7e9808..6b40237c253a 100644
--- a/android/abi_gki_protected_exports_x86_64
+++ b/android/abi_gki_protected_exports_x86_64
@@ -1,14 +1,9 @@
-__cfg80211_alloc_event_skb
-__cfg80211_alloc_reply_skb
-__cfg80211_radar_event
-__cfg80211_send_event_skb
 __hci_cmd_send
 __hci_cmd_sync
 __hci_cmd_sync_ev
 __hci_cmd_sync_sk
 __hci_cmd_sync_status
 __hci_cmd_sync_status_sk
-__ieee80211_schedule_txq
 __nfc_alloc_vendor_cmd_reply_skb
 alloc_can_err_skb
 alloc_can_skb
@@ -18,7 +13,6 @@ alloc_canxl_skb
 arc4_crypt
 arc4_setkey
 baswap
-bridge_tunnel_header
 bt_accept_dequeue
 bt_accept_enqueue
 bt_accept_unlink
@@ -94,106 +88,9 @@ cdc_ncm_rx_verify_nth32
 cdc_ncm_select_altsetting
 cdc_ncm_tx_fixup
 cdc_ncm_unbind
-cfg80211_any_usable_channels
-cfg80211_assoc_comeback
-cfg80211_assoc_failure
-cfg80211_auth_timeout
-cfg80211_background_cac_abort
-cfg80211_bss_color_notify
-cfg80211_bss_flush
-cfg80211_bss_iter
-cfg80211_cac_event
-cfg80211_calculate_bitrate
-cfg80211_ch_switch_notify
-cfg80211_ch_switch_started_notify
-cfg80211_chandef_compatible
-cfg80211_chandef_create
-cfg80211_chandef_dfs_required
-cfg80211_chandef_usable
-cfg80211_chandef_valid
-cfg80211_check_combinations
-cfg80211_check_station_change
-cfg80211_classify8021d
-cfg80211_conn_failed
-cfg80211_connect_done
-cfg80211_control_port_tx_status
-cfg80211_cqm_beacon_loss_notify
-cfg80211_cqm_pktloss_notify
-cfg80211_cqm_rssi_notify
-cfg80211_cqm_txe_notify
-cfg80211_crit_proto_stopped
-cfg80211_del_sta_sinfo
-cfg80211_disconnected
-cfg80211_external_auth_request
-cfg80211_find_elem_match
-cfg80211_find_vendor_elem
-cfg80211_free_nan_func
-cfg80211_ft_event
-cfg80211_get_bss
-cfg80211_get_drvinfo
-cfg80211_get_ies_channel_number
-cfg80211_get_iftype_ext_capa
-cfg80211_get_p2p_attr
-cfg80211_get_station
-cfg80211_gtk_rekey_notify
-cfg80211_ibss_joined
-cfg80211_iftype_allowed
-cfg80211_inform_bss_data
-cfg80211_inform_bss_frame_data
-cfg80211_is_element_inherited
-cfg80211_iter_combinations
-cfg80211_merge_profile
-cfg80211_mgmt_tx_status_ext
-cfg80211_michael_mic_failure
-cfg80211_nan_func_terminated
-cfg80211_nan_match
-cfg80211_new_sta
-cfg80211_notify_new_peer_candidate
-cfg80211_pmksa_candidate_notify
-cfg80211_pmsr_complete
-cfg80211_pmsr_report
-cfg80211_port_authorized
-cfg80211_probe_status
-cfg80211_put_bss
-cfg80211_ready_on_channel
-cfg80211_ref_bss
-cfg80211_reg_can_beacon
-cfg80211_reg_can_beacon_relax
-cfg80211_register_netdevice
-cfg80211_remain_on_channel_expired
-cfg80211_report_obss_beacon_khz
-cfg80211_report_wowlan_wakeup
-cfg80211_roamed
-cfg80211_rx_assoc_resp
-cfg80211_rx_control_port
-cfg80211_rx_mgmt_ext
-cfg80211_rx_mlme_mgmt
-cfg80211_rx_spurious_frame
-cfg80211_rx_unexpected_4addr_frame
-cfg80211_rx_unprot_mlme_mgmt
-cfg80211_scan_done
-cfg80211_sched_scan_results
-cfg80211_sched_scan_stopped
-cfg80211_sched_scan_stopped_locked
-cfg80211_send_layer2_update
-cfg80211_shutdown_all_interfaces
-cfg80211_sinfo_alloc_tid_stats
-cfg80211_sta_opmode_change_notify
-cfg80211_stop_iface
-cfg80211_tdls_oper_request
-cfg80211_tx_mgmt_expired
-cfg80211_tx_mlme_mgmt
-cfg80211_unlink_bss
-cfg80211_unregister_wdev
-cfg80211_update_owe_info_event
-cfg80211_valid_disable_subchannel_bitmap
-cfg80211_vendor_cmd_get_sender
-cfg80211_vendor_cmd_reply
 close_candev
 free_candev
-freq_reg_info
 generic_mii_ioctl
-get_wiphy_regdom
 h4_recv_buf
 hci_alloc_dev_priv
 hci_cmd_sync
@@ -222,151 +119,6 @@ hci_uart_unregister_device
 hci_unregister_cb
 hci_unregister_dev
 hidp_hid_driver
-ieee80211_alloc_hw_nm
-ieee80211_amsdu_to_8023s
-ieee80211_ap_probereq_get
-ieee80211_ave_rssi
-ieee80211_beacon_cntdwn_is_complete
-ieee80211_beacon_get_template
-ieee80211_beacon_get_tim
-ieee80211_beacon_loss
-ieee80211_beacon_set_cntdwn
-ieee80211_beacon_update_cntdwn
-ieee80211_bss_get_elem
-ieee80211_calc_rx_airtime
-ieee80211_calc_tx_airtime
-ieee80211_chandef_to_operating_class
-ieee80211_channel_switch_disconnect
-ieee80211_channel_to_freq_khz
-ieee80211_chswitch_done
-ieee80211_color_change_finish
-ieee80211_connection_loss
-ieee80211_cqm_beacon_loss_notify
-ieee80211_cqm_rssi_notify
-ieee80211_csa_finish
-ieee80211_ctstoself_duration
-ieee80211_ctstoself_get
-ieee80211_data_to_8023_exthdr
-ieee80211_disable_rssi_reports
-ieee80211_disconnect
-ieee80211_enable_rssi_reports
-ieee80211_find_sta
-ieee80211_find_sta_by_ifaddr
-ieee80211_find_sta_by_link_addrs
-ieee80211_free_hw
-ieee80211_free_txskb
-ieee80211_freq_khz_to_channel
-ieee80211_generic_frame_duration
-ieee80211_get_bssid
-ieee80211_get_buffered_bc
-ieee80211_get_channel_khz
-ieee80211_get_fils_discovery_tmpl
-ieee80211_get_hdrlen_from_skb
-ieee80211_get_key_rx_seq
-ieee80211_get_mesh_hdrlen
-ieee80211_get_num_supported_channels
-ieee80211_get_response_rate
-ieee80211_get_tkip_p1k_iv
-ieee80211_get_tkip_p2k
-ieee80211_get_tkip_rx_p1k
-ieee80211_get_tx_rates
-ieee80211_get_unsol_bcast_probe_resp_tmpl
-ieee80211_get_vht_max_nss
-ieee80211_gtk_rekey_add
-ieee80211_gtk_rekey_notify
-ieee80211_hdrlen
-ieee80211_hw_restart_disconnect
-ieee80211_ie_split_ric
-ieee80211_iter_chan_contexts_atomic
-ieee80211_iter_keys
-ieee80211_iter_keys_rcu
-ieee80211_iterate_active_interfaces_atomic
-ieee80211_iterate_active_interfaces_mtx
-ieee80211_iterate_interfaces
-ieee80211_iterate_stations
-ieee80211_iterate_stations_atomic
-ieee80211_key_mic_failure
-ieee80211_key_replay
-ieee80211_manage_rx_ba_offl
-ieee80211_mandatory_rates
-ieee80211_mark_rx_ba_filtered_frames
-ieee80211_nan_func_match
-ieee80211_nan_func_terminated
-ieee80211_next_txq
-ieee80211_nullfunc_get
-ieee80211_operating_class_to_band
-ieee80211_parse_p2p_noa
-ieee80211_probereq_get
-ieee80211_proberesp_get
-ieee80211_pspoll_get
-ieee80211_queue_delayed_work
-ieee80211_queue_stopped
-ieee80211_queue_work
-ieee80211_radar_detected
-ieee80211_radiotap_iterator_init
-ieee80211_radiotap_iterator_next
-ieee80211_rate_control_register
-ieee80211_rate_control_unregister
-ieee80211_ready_on_channel
-ieee80211_register_hw
-ieee80211_remain_on_channel_expired
-ieee80211_remove_key
-ieee80211_report_low_ack
-ieee80211_report_wowlan_wakeup
-ieee80211_request_smps
-ieee80211_reserve_tid
-ieee80211_restart_hw
-ieee80211_resume_disconnect
-ieee80211_rts_duration
-ieee80211_rts_get
-ieee80211_rx_ba_timer_expired
-ieee80211_rx_irqsafe
-ieee80211_rx_list
-ieee80211_rx_napi
-ieee80211_s1g_channel_width
-ieee80211_scan_completed
-ieee80211_sched_scan_results
-ieee80211_sched_scan_stopped
-ieee80211_send_bar
-ieee80211_send_eosp_nullfunc
-ieee80211_set_active_links
-ieee80211_set_active_links_async
-ieee80211_set_key_rx_seq
-ieee80211_sta_block_awake
-ieee80211_sta_eosp
-ieee80211_sta_ps_transition
-ieee80211_sta_pspoll
-ieee80211_sta_recalc_aggregates
-ieee80211_sta_register_airtime
-ieee80211_sta_set_buffered
-ieee80211_sta_uapsd_trigger
-ieee80211_start_tx_ba_cb_irqsafe
-ieee80211_start_tx_ba_session
-ieee80211_stop_queue
-ieee80211_stop_queues
-ieee80211_stop_rx_ba_session
-ieee80211_stop_tx_ba_cb_irqsafe
-ieee80211_stop_tx_ba_session
-ieee80211_tdls_oper_request
-ieee80211_tkip_add_iv
-ieee80211_tx_dequeue
-ieee80211_tx_prepare_skb
-ieee80211_tx_rate_update
-ieee80211_tx_status
-ieee80211_tx_status_8023
-ieee80211_tx_status_ext
-ieee80211_tx_status_irqsafe
-ieee80211_txq_airtime_check
-ieee80211_txq_get_depth
-ieee80211_txq_may_transmit
-ieee80211_txq_schedule_start
-ieee80211_unregister_hw
-ieee80211_unreserve_tid
-ieee80211_update_mu_groups
-ieee80211_update_p2p_noa
-ieee80211_vif_to_wdev
-ieee80211_wake_queue
-ieee80211_wake_queues
 ieee802154_alloc_hw
 ieee802154_configure_durations
 ieee802154_free_hw
@@ -383,7 +135,6 @@ ieee802154_wake_queue
 ieee802154_xmit_complete
 ieee802154_xmit_error
 ieee802154_xmit_hw_error
-ieeee80211_obss_color_collision_notify
 l2cap_add_psm
 l2cap_chan_close
 l2cap_chan_connect
@@ -481,16 +232,8 @@ qca_send_pre_shutdown_cmd
 qca_set_bdaddr
 qca_set_bdaddr_rome
 qca_uart_setup
-rate_control_set_rates
-reg_initiator_name
-reg_query_regdb_wmm
 register_candev
 register_pppox_proto
-regulatory_hint
-regulatory_pre_cac_allowed
-regulatory_set_wiphy_regd
-regulatory_set_wiphy_regd_sync
-rfc1042_header
 rfkill_alloc
 rfkill_blocked
 rfkill_destroy
@@ -586,17 +329,6 @@ usbnet_update_max_qlen
 usbnet_write_cmd
 usbnet_write_cmd_async
 usbnet_write_cmd_nopm
-wdev_chandef
-wdev_to_ieee80211_vif
-wiphy_apply_custom_regulatory
-wiphy_free
-wiphy_new_nm
-wiphy_read_of_freq_limits
-wiphy_register
-wiphy_rfkill_set_hw_state_reason
-wiphy_rfkill_start_polling
-wiphy_to_ieee80211_hw
-wiphy_unregister
 wpan_phy_find
 wpan_phy_for_each
 wpan_phy_free
diff --git a/android/gki_x86_64_protected_modules b/android/gki_x86_64_protected_modules
index a0bec3a45b4b..2a232a69f4a5 100644
--- a/android/gki_x86_64_protected_modules
+++ b/android/gki_x86_64_protected_modules
@@ -48,11 +48,9 @@ net/ieee802154/ieee802154.ko
 net/ieee802154/ieee802154_socket.ko
 net/l2tp/l2tp_core.ko
 net/l2tp/l2tp_ppp.ko
-net/mac80211/mac80211.ko
 net/mac802154/mac802154.ko
 net/nfc/nfc.ko
 net/rfkill/rfkill.ko
 net/tipc/diag.ko
 net/tipc/tipc.ko
-net/wireless/cfg80211.ko