ANDROID: ABI: gki_defconfig: disable cfg80211 and mac80211

Remove CONFIG_CFG80211 and CONFIG_MAC80211 from gki_defconfig
to allow vendors to incorporate features that lands upstream
after KMI freeze.

Also need to update symbol lists since the related 80211
symbols are no longer exported from the core kernel.

Bug: 227176212
Test: TH
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
Change-Id: Ia680c2b38d5f13263e318f8c5eaa42f591385736
(cherry picked from commit b24cd8be89)
Signed-off-by: Carlos Llamas <cmllamas@google.com>

BUILD.bazel

@@ -185,11 +185,13 @@ define_db845c(
         "drivers/watchdog/qcom-wdt.ko",
         # TODO(b/233404531): Remove zsmalloc.ko when db845c is a mixed build
         "mm/zsmalloc.ko",
+        "net/mac80211/mac80211.ko",
         "net/qrtr/ns.ko",
         "net/qrtr/qrtr.ko",
         "net/qrtr/qrtr-mhi.ko",
         "net/qrtr/qrtr-smd.ko",
         "net/qrtr/qrtr-tun.ko",
+        "net/wireless/cfg80211.ko",
         "sound/soc/codecs/snd-soc-dmic.ko",
         "sound/soc/codecs/snd-soc-hdmi-codec.ko",
         "sound/soc/codecs/snd-soc-lpass-va-macro.ko",

android/abi_gki_aarch64_db845c

@@ -25,14 +25,6 @@
   cdev_device_add
   cdev_device_del
   cdev_init
-  __cfg80211_alloc_event_skb
-  __cfg80211_alloc_reply_skb
-  cfg80211_find_elem_match
-  cfg80211_find_vendor_elem
-  cfg80211_get_bss
-  cfg80211_put_bss
-  __cfg80211_send_event_skb
-  cfg80211_vendor_cmd_reply
   __cfi_slowpath_diag
   __check_object_size
   clk_bulk_disable
@@ -281,35 +273,6 @@
   idr_for_each
   idr_get_next
   idr_remove
-  ieee80211_alloc_hw_nm
-  ieee80211_beacon_get_template
-  ieee80211_beacon_loss
-  ieee80211_bss_get_elem
-  ieee80211_channel_to_freq_khz
-  ieee80211_connection_loss
-  ieee80211_csa_finish
-  ieee80211_find_sta
-  ieee80211_find_sta_by_ifaddr
-  ieee80211_free_hw
-  ieee80211_free_txskb
-  ieee80211_get_channel_khz
-  ieee80211_hdrlen
-  ieee80211_iterate_active_interfaces_atomic
-  ieee80211_iterate_stations_atomic
-  ieee80211_queue_delayed_work
-  ieee80211_queue_work
-  ieee80211_radar_detected
-  ieee80211_register_hw
-  ieee80211_remain_on_channel_expired
-  ieee80211_report_low_ack
-  ieee80211_restart_hw
-  ieee80211_rx_napi
-  ieee80211_scan_completed
-  ieee80211_stop_queues
-  ieee80211_tx_status
-  ieee80211_tx_status_irqsafe
-  ieee80211_unregister_hw
-  ieee80211_wake_queues
   iio_read_channel_processed
   init_dummy_netdev
   init_net
@@ -718,7 +681,6 @@
   wake_up_process
   __warn_printk
   watchdog_init_timeout
-  wiphy_to_ieee80211_hw
   xa_erase
   xa_find
   xa_find_after
@@ -751,49 +713,23 @@
   report_iommu_fault
 
 # required by ath.ko
-  freq_reg_info
-  reg_initiator_name
-  wiphy_apply_custom_regulatory
 
 # required by ath10k_core.ko
-  cfg80211_calculate_bitrate
   cpu_latency_qos_add_request
   cpu_latency_qos_remove_request
   crc32_le
   device_get_mac_address
   device_set_wakeup_enable
   guid_gen
-  ieee80211_beacon_cntdwn_is_complete
-  ieee80211_beacon_get_tim
-  ieee80211_beacon_update_cntdwn
-  ieee80211_iter_chan_contexts_atomic
-  ieee80211_manage_rx_ba_offl
-  ieee80211_next_txq
-  ieee80211_proberesp_get
-  ieee80211_ready_on_channel
-  ieee80211_return_txq
-  ieee80211_sta_register_airtime
-  ieee80211_stop_queue
-  ieee80211_tdls_oper_request
-  ieee80211_tx_dequeue
-  ieee80211_txq_get_depth
-  ieee80211_txq_may_transmit
-  ieee80211_txq_schedule_start
-  ieee80211_tx_rate_update
-  ieee80211_wake_queue
   init_uts_ns
   __kfifo_alloc
   __kfifo_free
   param_ops_ulong
-  regulatory_hint
-  rfc1042_header
   skb_copy
   skb_dequeue_tail
   skb_queue_head
   skb_realloc_headroom
   strlcat
-  wiphy_read_of_freq_limits
-  wiphy_rfkill_set_hw_state_reason
 
 # required by ath10k_pci.ko
   pci_disable_msi
@@ -811,12 +747,7 @@
   crypto_shash_final
   crypto_shash_setkey
   crypto_shash_update
-  ieee80211_freq_khz_to_channel
-  ieee80211_get_fils_discovery_tmpl
-  ieee80211_get_hdrlen_from_skb
-  ieee80211_get_unsol_bcast_probe_resp_tmpl
   memcpy_and_pad
-  regulatory_set_wiphy_regd_sync
   rtnl_lock
   rtnl_unlock
 

android/abi_gki_aarch64_imx

@@ -1562,47 +1562,8 @@
 # required by moal.ko
   alloc_netdev_mqs
   __alloc_skb
-  __cfg80211_alloc_event_skb
-  __cfg80211_alloc_reply_skb
-  cfg80211_cac_event
-  cfg80211_ch_switch_notify
-  cfg80211_classify8021d
-  cfg80211_connect_done
-  cfg80211_cqm_rssi_notify
-  cfg80211_del_sta_sinfo
-  cfg80211_disconnected
-  cfg80211_find_elem_match
-  cfg80211_ft_event
-  cfg80211_get_bss
-  cfg80211_inform_bss_data
-  cfg80211_mgmt_tx_status
-  cfg80211_michael_mic_failure
-  cfg80211_new_sta
-  cfg80211_pmksa_candidate_notify
-  cfg80211_put_bss
-  __cfg80211_radar_event
-  cfg80211_ready_on_channel
-  cfg80211_register_netdevice
-  cfg80211_remain_on_channel_expired
-  cfg80211_report_wowlan_wakeup
-  cfg80211_roamed
-  cfg80211_rx_assoc_resp
-  cfg80211_rx_mgmt_khz
-  cfg80211_rx_mlme_mgmt
-  cfg80211_scan_done
-  cfg80211_sched_scan_results
-  cfg80211_sched_scan_stopped
-  __cfg80211_send_event_skb
-  cfg80211_tdls_oper_request
-  cfg80211_unlink_bss
-  cfg80211_unregister_wdev
-  cfg80211_vendor_cmd_reply
   dev_alloc_name
   ether_setup
-  ieee80211_bss_get_elem
-  ieee80211_channel_to_freq_khz
-  ieee80211_freq_khz_to_channel
-  ieee80211_get_channel_khz
   in4_pton
   init_dummy_netdev
   init_net
@@ -1661,8 +1622,6 @@
   _raw_spin_unlock_bh
   register_inet6addr_notifier
   register_inetaddr_notifier
-  regulatory_hint
-  regulatory_set_wiphy_regd_sync
   request_firmware_direct
   rtnl_is_locked
   schedule_timeout_uninterruptible
@@ -1697,11 +1656,6 @@
   vprintk
   wakeup_source_add
   wakeup_source_remove
-  wiphy_apply_custom_regulatory
-  wiphy_free
-  wiphy_new_nm
-  wiphy_register
-  wiphy_unregister
   wireless_send_event
 
 # required by mpl3115.ko

android/abi_gki_aarch64_mtk

@@ -2438,38 +2438,6 @@
 # preserved by --additions-only
   alloc_netdev_mqs
   build_skb
-  __cfg80211_alloc_event_skb
-  __cfg80211_alloc_reply_skb
-  cfg80211_chandef_create
-  cfg80211_ch_switch_notify
-  cfg80211_classify8021d
-  cfg80211_connect_done
-  cfg80211_del_sta_sinfo
-  cfg80211_disconnected
-  cfg80211_external_auth_request
-  cfg80211_find_elem_match
-  cfg80211_ft_event
-  cfg80211_get_bss
-  cfg80211_inform_bss_data
-  cfg80211_inform_bss_frame_data
-  cfg80211_mgmt_tx_status
-  cfg80211_michael_mic_failure
-  cfg80211_new_sta
-  cfg80211_pmksa_candidate_notify
-  cfg80211_put_bss
-  cfg80211_ready_on_channel
-  cfg80211_register_netdevice
-  cfg80211_remain_on_channel_expired
-  cfg80211_roamed
-  cfg80211_rx_mgmt_khz
-  cfg80211_scan_done
-  cfg80211_sched_scan_results
-  cfg80211_sched_scan_stopped
-  __cfg80211_send_event_skb
-  cfg80211_tdls_oper_request
-  cfg80211_unlink_bss
-  cfg80211_unregister_wdev
-  cfg80211_vendor_cmd_reply
   clkdev_add
   clkdev_drop
   clk_register_gate
@@ -2486,9 +2454,6 @@
   hci_unregister_dev
   hdmi_audio_infoframe_init
   hex_dump_to_buffer
-  ieee80211_channel_to_freq_khz
-  ieee80211_get_channel_khz
-  ieee80211_operating_class_to_band
   kthread_cancel_delayed_work_sync
   kthread_delayed_work_timer_fn
   kthread_queue_delayed_work
@@ -2547,9 +2512,4 @@
   strpbrk
   strspn
   unregister_inetaddr_notifier
-  wiphy_apply_custom_regulatory
-  wiphy_free
-  wiphy_new_nm
-  wiphy_register
-  wiphy_unregister
   wireless_send_event

android/abi_gki_aarch64_mtktv

@@ -92,41 +92,6 @@
   cec_transmit_attempt_done_ts
   cec_transmit_done_ts
   cec_unregister_adapter
-  __cfg80211_alloc_event_skb
-  __cfg80211_alloc_reply_skb
-  cfg80211_assoc_timeout
-  cfg80211_cac_event
-  cfg80211_chandef_create
-  cfg80211_ch_switch_notify
-  cfg80211_classify8021d
-  cfg80211_connect_done
-  cfg80211_cqm_rssi_notify
-  cfg80211_cqm_txe_notify
-  cfg80211_del_sta_sinfo
-  cfg80211_disconnected
-  cfg80211_find_elem_match
-  cfg80211_ft_event
-  cfg80211_get_bss
-  cfg80211_inform_bss_frame_data
-  cfg80211_mgmt_tx_status
-  cfg80211_michael_mic_failure
-  cfg80211_new_sta
-  cfg80211_pmksa_candidate_notify
-  cfg80211_put_bss
-  __cfg80211_radar_event
-  cfg80211_ready_on_channel
-  cfg80211_remain_on_channel_expired
-  cfg80211_rx_assoc_resp
-  cfg80211_rx_mgmt_khz
-  cfg80211_rx_mlme_mgmt
-  cfg80211_scan_done
-  cfg80211_sched_scan_results
-  cfg80211_sched_scan_stopped
-  __cfg80211_send_event_skb
-  cfg80211_tdls_oper_request
-  cfg80211_tx_mlme_mgmt
-  cfg80211_unlink_bss
-  cfg80211_vendor_cmd_reply
   __cfi_slowpath_diag
   __check_object_size
   __class_create
@@ -708,10 +673,6 @@
   idr_for_each
   idr_get_next
   idr_remove
-  ieee80211_channel_to_freq_khz
-  ieee80211_freq_khz_to_channel
-  ieee80211_get_channel_khz
-  ieee80211_operating_class_to_band
   iget5_locked
   igrab
   ihold
@@ -1234,7 +1195,6 @@
   regulator_set_mode
   regulator_set_voltage
   regulator_set_voltage_time
-  regulatory_hint
   release_firmware
   __release_region
   remap_pfn_range
@@ -1758,11 +1718,6 @@
   watchdog_register_device
   watchdog_set_restart_priority
   watchdog_unregister_device
-  wiphy_apply_custom_regulatory
-  wiphy_free
-  wiphy_new_nm
-  wiphy_register
-  wiphy_unregister
   wireless_send_event
   woken_wake_function
   ww_mutex_lock

android/abi_gki_aarch64_pixel

@@ -16,12 +16,15 @@
   __alloc_pages
   alloc_pages_exact
   __alloc_percpu
+  __alloc_percpu_gfp
   __alloc_skb
   alloc_workqueue
   amba_driver_register
   amba_driver_unregister
   android_rvh_probe_register
   anon_inode_getfd
+  arc4_crypt
+  arc4_setkey
   __arch_clear_user
   __arch_copy_from_user
   __arch_copy_to_user
@@ -81,6 +84,7 @@
   bus_unregister
   bus_unregister_notifier
   cache_line_size
+  call_rcu
   cancel_delayed_work
   cancel_delayed_work_sync
   cancel_work_sync
@@ -91,34 +95,6 @@
   cdev_device_add
   cdev_device_del
   cdev_init
-  __cfg80211_alloc_event_skb
-  __cfg80211_alloc_reply_skb
-  cfg80211_chandef_create
-  cfg80211_ch_switch_notify
-  cfg80211_connect_done
-  cfg80211_del_sta_sinfo
-  cfg80211_disconnected
-  cfg80211_external_auth_request
-  cfg80211_find_elem_match
-  cfg80211_get_bss
-  cfg80211_ibss_joined
-  cfg80211_inform_bss_frame_data
-  cfg80211_mgmt_tx_status
-  cfg80211_michael_mic_failure
-  cfg80211_new_sta
-  cfg80211_port_authorized
-  cfg80211_put_bss
-  cfg80211_ready_on_channel
-  cfg80211_remain_on_channel_expired
-  cfg80211_roamed
-  cfg80211_rx_mgmt_khz
-  cfg80211_scan_done
-  cfg80211_sched_scan_results
-  cfg80211_sched_scan_stopped
-  __cfg80211_send_event_skb
-  cfg80211_unlink_bss
-  cfg80211_unregister_wdev
-  cfg80211_vendor_cmd_reply
   __cfi_slowpath_diag
   __check_object_size
   __class_create
@@ -225,6 +201,8 @@
   cpus_read_lock
   cpus_read_unlock
   cpu_subsys
+  crc32_be
+  crc32_le
   crc8
   crc8_populate_msb
   crypto_aead_decrypt
@@ -233,13 +211,18 @@
   crypto_aead_setkey
   crypto_alloc_aead
   crypto_alloc_shash
+  crypto_alloc_skcipher
   crypto_alloc_sync_skcipher
   crypto_destroy_tfm
+  __crypto_memneq
   crypto_shash_digest
   crypto_shash_finup
   crypto_shash_setkey
+  crypto_shash_update
+  crypto_skcipher_decrypt
   crypto_skcipher_encrypt
   crypto_skcipher_setkey
+  __crypto_xor
   csum_ipv6_magic
   csum_tcpudp_nofold
   _ctype
@@ -257,6 +240,7 @@
   debugfs_create_x32
   debugfs_lookup
   debugfs_remove
+  debugfs_rename
   dec_zone_page_state
   default_llseek
   deferred_free
@@ -265,12 +249,15 @@
   del_timer_sync
   desc_to_gpio
   destroy_workqueue
+  dev_alloc_name
+  __dev_change_net_namespace
   dev_close
   _dev_crit
   dev_driver_string
   _dev_emerg
   _dev_err
   dev_err_probe
+  dev_fetch_sw_netstats
   devfreq_add_device
   devfreq_add_governor
   devfreq_monitor_resume
@@ -283,12 +270,16 @@
   devfreq_unregister_opp_notifier
   devfreq_update_interval
   dev_fwnode
+  __dev_get_by_index
+  dev_get_by_index
   dev_get_by_name
+  device_add
   device_add_groups
   device_create
   device_create_file
   device_create_managed_software_node
   device_create_with_groups
+  device_del
   device_destroy
   device_find_child
   device_for_each_child
@@ -303,6 +294,7 @@
   device_register
   device_remove_file
   device_remove_groups
+  device_rename
   device_set_wakeup_capable
   device_set_wakeup_enable
   device_unregister
@@ -648,6 +640,7 @@
   drm_property_create_signed_range
   drm_property_lookup_blob
   drm_property_replace_blob
+  drm_puts
   __drm_puts_seq_file
   drm_read
   drm_rect_clip_scaled
@@ -675,6 +668,9 @@
   emergency_restart
   enable_irq
   enable_percpu_irq
+  ether_setup
+  eth_mac_addr
+  ethtool_op_get_link
   eth_type_trans
   eventfd_ctx_fdget
   eventfd_ctx_put
@@ -701,6 +697,7 @@
   find_task_by_vpid
   __find_vma
   finish_wait
+  flush_delayed_work
   flush_work
   flush_workqueue
   fput
@@ -721,9 +718,11 @@
   full_name_hash
   fwnode_get_name
   fwnode_gpiod_get_index
+  gcd
   generic_file_llseek
   generic_handle_domain_irq
   generic_iommu_put_resv_regions
+  genlmsg_multicast_allns
   genlmsg_put
   genl_register_family
   genl_unregister_family
@@ -742,6 +741,8 @@
   get_device
   __get_free_pages
   get_governor_parent_kobj
+  get_net_ns_by_fd
+  get_net_ns_by_pid
   get_pid_task
   get_random_bytes
   get_random_u32
@@ -800,6 +801,9 @@
   hrtimer_sleeper_start_expires
   hrtimer_start_range_ns
   hrtimer_try_to_cancel
+  __hw_addr_init
+  __hw_addr_sync
+  __hw_addr_unsync
   hwrng_register
   hwrng_unregister
   i2c_adapter_type
@@ -828,11 +832,9 @@
   idr_destroy
   idr_find
   idr_for_each
+  idr_get_next
   idr_preload
   idr_remove
-  ieee80211_channel_to_freq_khz
-  ieee80211_freq_khz_to_channel
-  ieee80211_get_channel_khz
   ieee802154_alloc_hw
   ieee802154_free_hw
   ieee802154_register_hw
@@ -845,6 +847,7 @@
   in6_pton
   in_aton
   inc_zone_page_state
+  inet_csk_get_port
   init_dummy_netdev
   init_net
   init_pid_ns
@@ -853,6 +856,7 @@
   __init_swait_queue_head
   init_task
   init_timer_key
+  init_uts_ns
   init_wait_entry
   __init_waitqueue_head
   input_allocate_device
@@ -942,9 +946,14 @@
   kasprintf
   kernel_cpustat
   kernel_kobj
+  kernel_param_lock
+  kernel_param_unlock
   kernel_restart
   kern_mount
   kern_unmount
+  key_create_or_update
+  key_put
+  keyring_alloc
   __kfifo_alloc
   __kfifo_free
   __kfifo_in
@@ -954,6 +963,7 @@
   kfree
   kfree_sensitive
   kfree_skb
+  kfree_skb_list
   kill_anon_super
   kill_fasync
   kimage_voffset
@@ -1011,11 +1021,13 @@
   kthread_stop
   kthread_worker_fn
   ktime_get
+  ktime_get_coarse_with_offset
   ktime_get_mono_fast_ns
   ktime_get_raw
   ktime_get_raw_ts64
   ktime_get_real_seconds
   ktime_get_real_ts64
+  ktime_get_seconds
   ktime_get_snapshot
   ktime_get_ts64
   ktime_get_with_offset
@@ -1095,24 +1107,38 @@
   __napi_schedule
   napi_schedule_prep
   __netdev_alloc_skb
+  netdev_err
+  netdev_info
+  netdev_set_default_ethtool_ops
   netdev_state_change
   netdev_update_features
+  netif_carrier_off
+  netif_carrier_on
   netif_napi_add
   __netif_napi_del
   netif_receive_skb
+  netif_receive_skb_list
   netif_rx
   netif_rx_ni
+  netif_tx_stop_all_queues
   netif_tx_wake_queue
+  netlink_broadcast
   __netlink_kernel_create
   netlink_kernel_release
+  netlink_register_notifier
   netlink_unicast
+  netlink_unregister_notifier
+  net_ns_type_operations
   net_ratelimit
+  nla_find
   nla_memcpy
   __nla_parse
   nla_put_64bit
   nla_put
   nla_put_nohdr
+  nla_reserve
   nla_strscpy
+  __nla_validate
   __nlmsg_put
   no_llseek
   nonseekable_open
@@ -1336,6 +1362,7 @@
   pps_event
   pps_register_source
   pps_unregister_source
+  prandom_bytes
   prandom_u32
   preempt_schedule
   preempt_schedule_notrace
@@ -1355,7 +1382,9 @@
   proc_remove
   pskb_expand_head
   __pskb_pull_tail
+  ___pskb_trim
   put_device
+  __put_net
   __put_page
   put_pid
   put_sg_io_hdr
@@ -1396,6 +1425,7 @@
   rb_next
   rb_prev
   rb_replace_node
+  rcu_barrier
   __rcu_read_lock
   __rcu_read_unlock
   rdev_get_drvdata
@@ -1417,6 +1447,7 @@
   register_netdevice
   register_netdevice_notifier
   register_oom_notifier
+  register_pernet_device
   register_pernet_subsys
   register_pm_notifier
   register_reboot_notifier
@@ -1459,9 +1490,6 @@
   regulator_set_voltage
   regulator_set_voltage_sel_regmap
   regulator_unregister
-  regulatory_hint
-  regulatory_set_wiphy_regd
-  regulatory_set_wiphy_regd_sync
   release_firmware
   __release_region
   remap_pfn_range
@@ -1476,11 +1504,23 @@
   request_threaded_irq
   return_address
   rfkill_alloc
+  rfkill_blocked
   rfkill_destroy
   rfkill_init_sw_state
   rfkill_register
+  rfkill_resume_polling
+  rfkill_set_hw_state_reason
   rfkill_unregister
+  rhashtable_free_and_destroy
+  rhashtable_insert_slow
+  rhltable_init
+  __rht_bucket_nested
+  rht_bucket_nested
+  rht_bucket_nested_insert
   root_task_group
+  round_jiffies
+  round_jiffies_relative
+  round_jiffies_up
   rps_needed
   rtc_class_close
   rtc_class_open
@@ -1570,11 +1610,20 @@
   single_open
   single_open_size
   single_release
+  skb_add_rx_frag
   skb_checksum
+  skb_checksum_help
   skb_clone
+  skb_clone_sk
+  skb_complete_wifi_ack
   skb_copy
+  skb_copy_bits
+  skb_copy_expand
   skb_dequeue
   skb_dequeue_tail
+  skb_ensure_writable
+  __skb_get_hash
+  __skb_gso_segment
   skb_pull
   skb_push
   skb_put
@@ -1650,6 +1699,8 @@
   snd_soc_unregister_component
   snprintf
   soc_device_register
+  __sock_create
+  sock_release
   sock_wfree
   softnet_data
   sort
@@ -1705,8 +1756,10 @@
   strspn
   strstr
   subsys_system_register
+  __sw_hweight16
   __sw_hweight32
   __sw_hweight64
+  __sw_hweight8
   sync_file_create
   sync_file_get_fence
   synchronize_irq
@@ -1731,9 +1784,11 @@
   sysfs_streq
   sysfs_update_group
   sysrq_mask
+  system_freezable_wq
   system_freezing_cnt
   system_highpri_wq
   system_long_wq
+  system_power_efficient_wq
   system_state
   system_unbound_wq
   system_wq
@@ -1742,6 +1797,7 @@
   tasklet_init
   tasklet_kill
   __tasklet_schedule
+  tasklet_setup
   tasklet_unlock_wait
   task_may_not_preempt
   __task_pid_nr_ns
@@ -1930,9 +1986,11 @@
   unregister_inet6addr_notifier
   unregister_inetaddr_notifier
   unregister_netdev
+  unregister_netdevice_many
   unregister_netdevice_notifier
   unregister_netdevice_queue
   unregister_oom_notifier
+  unregister_pernet_device
   unregister_pernet_subsys
   unregister_pm_notifier
   unregister_reboot_notifier
@@ -2039,6 +2097,7 @@
   vb2_streamon
   vb2_vmalloc_memops
   vb2_wait_for_all_buffers
+  verify_pkcs7_signature
   vfree
   video_devdata
   video_device_alloc
@@ -2090,11 +2149,7 @@
   watchdog_register_device
   watchdog_set_restart_priority
   watchdog_unregister_device
-  wiphy_apply_custom_regulatory
+  wireless_nlevent_flush
-  wiphy_free
-  wiphy_new_nm
-  wiphy_register
-  wiphy_unregister
   woken_wake_function
   work_busy
   __xfrm_state_destroy

android/abi_gki_aarch64_qcom

@@ -112,13 +112,6 @@
   cdev_device_add
   cdev_device_del
   cdev_init
-  cfg80211_gtk_rekey_notify
-  cfg80211_register_netdevice
-  cfg80211_rx_control_port
-  cfg80211_rx_unprot_mlme_mgmt
-  cfg80211_stop_iface
-  cfg80211_update_owe_info_event
-  cfg80211_vendor_cmd_get_sender
   __cfi_slowpath_diag
   cgroup_path_ns
   cgroup_taskset_first
@@ -1616,7 +1609,6 @@
   regulator_set_mode
   regulator_set_voltage
   regulator_unregister_notifier
-  regulatory_set_wiphy_regd
   release_firmware
   __release_region
   release_sock

android/abi_gki_aarch64_unisoc

@@ -421,9 +421,6 @@
   idr_find
   idr_for_each
   idr_remove
-  ieee80211_channel_to_freq_khz
-  ieee80211_freq_khz_to_channel
-  ieee80211_get_channel_khz
   iget_failed
   iget5_locked
   ignore_console_lock_warning
@@ -2416,38 +2413,10 @@
 # required by sprdwl_ng.ko
   bcmp
   build_skb
-  __cfg80211_alloc_event_skb
-  __cfg80211_alloc_reply_skb
-  cfg80211_chandef_create
-  cfg80211_ch_switch_notify
-  cfg80211_connect_done
-  cfg80211_cqm_rssi_notify
-  cfg80211_del_sta_sinfo
-  cfg80211_disconnected
-  cfg80211_find_elem_match
-  cfg80211_get_bss
-  cfg80211_ibss_joined
-  cfg80211_inform_bss_data
-  cfg80211_mgmt_tx_status
-  cfg80211_michael_mic_failure
-  cfg80211_new_sta
-  cfg80211_put_bss
-  cfg80211_ready_on_channel
-  cfg80211_remain_on_channel_expired
-  cfg80211_roamed
-  cfg80211_rx_unprot_mlme_mgmt
-  cfg80211_scan_done
-  cfg80211_sched_scan_results
-  __cfg80211_send_event_skb
-  cfg80211_tdls_oper_request
-  cfg80211_unlink_bss
-  cfg80211_unregister_wdev
-  cfg80211_vendor_cmd_reply
   consume_skb
   _ctype
   dev_get_by_index
   down_timeout
-  freq_reg_info
   genlmsg_put
   jiffies_to_usecs
   kfree_skb_list
@@ -2463,7 +2432,6 @@
   register_inet6addr_notifier
   register_inetaddr_notifier
   register_netdevice
-  regulatory_hint
   rtnl_lock
   rtnl_unlock
   simple_open
@@ -2474,10 +2442,6 @@
   unregister_inetaddr_notifier
   unregister_netdevice_queue
   __warn_printk
-  wiphy_free
-  wiphy_new_nm
-  wiphy_register
-  wiphy_unregister
 
 # required by sunwave_fp.ko
   input_unregister_device

android/abi_gki_aarch64_virtual_device

@@ -688,10 +688,6 @@
   skb_queue_purge
 
 # required by mac80211_hwsim.ko
-  __cfg80211_alloc_event_skb
-  __cfg80211_alloc_reply_skb
-  __cfg80211_send_event_skb
-  cfg80211_vendor_cmd_reply
   debugfs_attr_read
   debugfs_attr_write
   dev_alloc_name
@@ -702,29 +698,6 @@
   genl_notify
   genl_register_family
   genl_unregister_family
-  ieee80211_alloc_hw_nm
-  ieee80211_beacon_cntdwn_is_complete
-  ieee80211_beacon_get_tim
-  ieee80211_csa_finish
-  ieee80211_free_hw
-  ieee80211_free_txskb
-  ieee80211_get_buffered_bc
-  ieee80211_get_tx_rates
-  ieee80211_iterate_active_interfaces_atomic
-  ieee80211_probereq_get
-  ieee80211_queue_delayed_work
-  ieee80211_radar_detected
-  ieee80211_ready_on_channel
-  ieee80211_register_hw
-  ieee80211_remain_on_channel_expired
-  ieee80211_rx_irqsafe
-  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
   init_net
   netlink_broadcast
   netlink_register_notifier
@@ -736,7 +709,6 @@
   nla_put_64bit
   nla_put
   register_pernet_device
-  regulatory_hint
   rhashtable_destroy
   rhashtable_init
   rhashtable_insert_slow
@@ -751,7 +723,6 @@
   __skb_ext_put
   skb_unlink
   unregister_pernet_device
-  wiphy_apply_custom_regulatory
 
 # required by nd_virtio.ko
   bio_alloc_bioset
@@ -1027,21 +998,12 @@
   wake_up_process
 
 # required by virt_wifi.ko
-  cfg80211_connect_done
-  cfg80211_disconnected
-  cfg80211_inform_bss_data
-  cfg80211_put_bss
-  cfg80211_scan_done
   __dev_get_by_index
   _dev_printk
   __module_get
   netdev_upper_dev_link
   netif_stacked_transfer_operstate
   unregister_netdevice_many
-  wiphy_free
-  wiphy_new_nm
-  wiphy_register
-  wiphy_unregister
 
 # required by virtio-gpu.ko
   __devm_request_region

arch/arm64/configs/db845c_gki.fragment

@@ -1,3 +1,8 @@
+CONFIG_CFG80211=m
+CONFIG_NL80211_TESTMODE=y
+# CONFIG_CFG80211_DEFAULT_PS is not set
+# CONFIG_CFG80211_CRDA_SUPPORT is not set
+CONFIG_MAC80211=m
 CONFIG_QRTR=m
 CONFIG_QRTR_TUN=m
 CONFIG_SCSI_UFS_QCOM=m

arch/arm64/configs/gki_defconfig

@@ -280,11 +280,6 @@ CONFIG_BT_HCIUART=y
 CONFIG_BT_HCIUART_LL=y
 CONFIG_BT_HCIUART_BCM=y
 CONFIG_BT_HCIUART_QCA=y
-CONFIG_CFG80211=y
-CONFIG_NL80211_TESTMODE=y
-# CONFIG_CFG80211_DEFAULT_PS is not set
-# CONFIG_CFG80211_CRDA_SUPPORT is not set
-CONFIG_MAC80211=y
 CONFIG_RFKILL=y
 CONFIG_NFC=y
 CONFIG_PCI=y

arch/x86/configs/gki_defconfig

@@ -260,11 +260,6 @@ CONFIG_BT_HCIUART=y
 CONFIG_BT_HCIUART_LL=y
 CONFIG_BT_HCIUART_BCM=y
 CONFIG_BT_HCIUART_QCA=y
-CONFIG_CFG80211=y
-CONFIG_NL80211_TESTMODE=y
-# CONFIG_CFG80211_DEFAULT_PS is not set
-# CONFIG_CFG80211_CRDA_SUPPORT is not set
-CONFIG_MAC80211=y
 CONFIG_RFKILL=y
 CONFIG_NFC=y
 CONFIG_PCI=y