ANDROID: ABI: gki_defconfig: Make cfg80211 and mac80211 modules

Remove CONFIG_CFG80211 and CONFIG_MAC80211 from gki_defconfig
to allow vendors to incorporate features that have landed upstream.

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

Bug: 189918667
Signed-off-by: Todd Kjos <tkjos@google.com>
Change-Id: Iab3971cd0d78d669536b8eb0505c60caa3aafeee

android/abi_gki_aarch64_db845c

@@ -2,19 +2,25 @@
 # commonly used symbols
   add_uevent_var
   alloc_io_pgtable_ops
+  __alloc_skb
   alloc_workqueue
   __arch_copy_from_user
   __arch_copy_to_user
   arm64_const_caps_ready
   arm64_use_ng_mappings
+  bcmp
   blocking_notifier_call_chain
   blocking_notifier_chain_register
   blocking_notifier_chain_unregister
+  bpf_trace_run1
+  bpf_trace_run2
   bpf_trace_run3
   bpf_trace_run4
   bpf_trace_run5
+  bpf_trace_run6
   bus_register
   bus_unregister
+  cancel_delayed_work
   cancel_delayed_work_sync
   cancel_work_sync
   capable
@@ -23,6 +29,8 @@
   cdev_init
   __cfi_slowpath
   __check_object_size
+  __class_register
+  class_unregister
   clk_bulk_disable
   clk_bulk_enable
   clk_bulk_prepare
@@ -54,7 +62,9 @@
   cpumask_next
   cpu_number
   __cpu_online_mask
+  __cpu_possible_mask
   crc32_le
+  _ctype
   debugfs_create_dir
   debugfs_create_file
   debugfs_create_u32
@@ -62,8 +72,10 @@
   debugfs_remove
   default_llseek
   delayed_work_timer_fn
+  del_timer
   del_timer_sync
   destroy_workqueue
+  dev_close
   dev_coredumpv
   dev_driver_string
   _dev_err
@@ -108,6 +120,7 @@
   devm_pinctrl_register
   devm_platform_ioremap_resource
   devm_regmap_add_irq_chip
+  devm_regmap_field_alloc
   __devm_regmap_init
   __devm_regmap_init_i2c
   __devm_regmap_init_mmio_clk
@@ -175,15 +188,20 @@
   drm_helper_probe_single_connector_modes
   drm_mode_vrefresh
   enable_irq
+  eth_mac_addr
   eth_platform_get_mac_address
+  ethtool_op_get_link
+  eth_type_trans
   eth_validate_addr
   event_triggers_call
   find_next_bit
   find_next_zero_bit
   finish_wait
+  flush_work
   flush_workqueue
   free_io_pgtable_ops
   free_irq
+  gcd
   generic_handle_irq
   generic_mii_ioctl
   get_device
@@ -232,12 +250,13 @@
   idr_alloc_cyclic
   idr_destroy
   idr_find
+  idr_for_each
   idr_get_next
   idr_remove
-  ieee80211_get_channel_khz
   init_net
   __init_swait_queue_head
   init_timer_key
+  init_uts_ns
   init_wait_entry
   __init_waitqueue_head
   iomem_resource
@@ -276,6 +295,8 @@
   irq_to_desc
   is_vmalloc_addr
   jiffies
+  jiffies_to_msecs
+  jiffies_to_usecs
   kasan_flag_enabled
   kasprintf
   kernel_connect
@@ -284,6 +305,7 @@
   kernel_sendmsg
   kfree
   kfree_const
+  kfree_sensitive
   kfree_skb
   __kmalloc
   kmalloc_caches
@@ -297,8 +319,12 @@
   ktime_get
   ktime_get_mono_fast_ns
   ktime_get_real_ts64
+  kvfree
+  kvfree_call_rcu
+  kvmalloc_node
   __list_add_valid
   __list_del_entry_valid
+  __local_bh_enable_ip
   __log_post_read_mmio
   __log_read_mmio
   __log_write_mmio
@@ -313,10 +339,12 @@
   memremap
   memset
   memstart_addr
+  memunmap
   mii_ethtool_gset
   mii_nway_restart
   misc_deregister
   misc_register
+  mod_delayed_work_on
   mod_timer
   module_layout
   __msecs_to_jiffies
@@ -333,10 +361,15 @@
   netdev_err
   netdev_info
   netdev_warn
+  netif_carrier_on
   netif_napi_add
   __netif_napi_del
+  __nla_parse
+  nla_put
   no_llseek
   nr_cpu_ids
+  nvmem_cell_get
+  nvmem_cell_put
   nvmem_cell_read
   of_address_to_resource
   of_alias_get_id
@@ -348,6 +381,7 @@
   of_device_is_compatible
   of_device_uevent_modalias
   of_dma_configure_id
+  of_find_device_by_node
   of_find_property
   of_fwnode_ops
   of_genpd_add_provider_onecell
@@ -380,8 +414,11 @@
   of_property_read_u32_index
   of_property_read_variable_u32_array
   of_property_read_variable_u8_array
+  of_prop_next_u32
   of_reserved_mem_lookup
   param_ops_bool
+  param_ops_charp
+  param_ops_int
   param_ops_uint
   __pci_register_driver
   pci_unregister_driver
@@ -419,10 +456,12 @@
   __pm_runtime_set_status
   __pm_runtime_suspend
   __pm_runtime_use_autosuspend
+  preempt_schedule
   preempt_schedule_notrace
   prepare_to_wait_event
   printk
   pskb_expand_head
+  __pskb_pull_tail
   put_device
   __put_task_struct
   qcom_smem_state_register
@@ -451,10 +490,13 @@
   regcache_cache_only
   regcache_mark_dirty
   regcache_sync
+  register_netdevice_notifier
   register_reboot_notifier
   __register_rpmsg_driver
   regmap_bulk_read
   regmap_bulk_write
+  regmap_field_read
+  regmap_field_update_bits_base
   __regmap_init
   regmap_irq_get_virq
   regmap_multi_reg_write
@@ -480,6 +522,7 @@
   reset_control_assert
   reset_control_deassert
   reset_control_reset
+  round_jiffies_up
   rpmsg_register_device
   rpmsg_send
   rpmsg_unregister_device
@@ -490,6 +533,9 @@
   rproc_del
   rproc_free
   rproc_remove_subdev
+  rtnl_is_locked
+  rtnl_lock
+  rtnl_unlock
   schedule
   schedule_timeout
   scnprintf
@@ -507,10 +553,14 @@
   single_open
   single_release
   skb_clone
+  skb_copy
+  skb_copy_bits
+  skb_copy_expand
   skb_dequeue
   skb_pull
   skb_push
   skb_put
+  skb_queue_head
   skb_queue_purge
   skb_queue_tail
   skb_trim
@@ -557,16 +607,22 @@
   strncpy
   strpbrk
   strsep
+  __sw_hweight16
   __sw_hweight32
   __sw_hweight64
+  __sw_hweight8
   synchronize_irq
   synchronize_net
+  synchronize_rcu
   syscon_node_to_regmap
   syscon_regmap_lookup_by_phandle
   sysfs_create_link
   sysfs_remove_link
   sysrq_mask
+  system_power_efficient_wq
   system_wq
+  tasklet_init
+  tasklet_kill
   __tasklet_schedule
   thermal_cooling_device_unregister
   trace_event_buffer_commit
@@ -597,6 +653,7 @@
   uart_write_wakeup
   __udelay
   unregister_chrdev_region
+  unregister_netdevice_notifier
   unregister_reboot_notifier
   unregister_rpmsg_driver
   usb_deregister
@@ -623,6 +680,7 @@
   usbnet_write_cmd_async
   usbnet_write_cmd_nopm
   usb_register_driver
+  __usecs_to_jiffies
   usleep_range
   vabits_actual
   vfree
@@ -657,12 +715,10 @@
   iommu_group_ref_get
   iommu_put_dma_cookie
   of_dma_is_coherent
-  param_ops_int
   pci_bus_type
   pci_device_group
 
 # required by asix.ko
-  eth_mac_addr
   genphy_resume
   mdiobus_alloc_size
   mdiobus_free
@@ -679,7 +735,6 @@
   phy_print_status
   phy_start
   phy_stop
-  skb_copy_expand
   usbnet_change_mtu
   usbnet_get_drvinfo
   usbnet_get_link
@@ -687,98 +742,23 @@
   usbnet_set_link_ksettings
   usbnet_unlink_rx_urbs
 
-# required by ath.ko
-  freq_reg_info
-  reg_initiator_name
-  wiphy_apply_custom_regulatory
-
 # required by ath10k_core.ko
-  bcmp
-  cancel_delayed_work
-  __cfg80211_alloc_event_skb
-  __cfg80211_alloc_reply_skb
-  cfg80211_calculate_bitrate
-  cfg80211_find_elem_match
-  cfg80211_find_vendor_elem
-  cfg80211_get_bss
-  cfg80211_put_bss
-  __cfg80211_send_event_skb
-  cfg80211_vendor_cmd_reply
   cpu_latency_qos_add_request
   cpu_latency_qos_remove_request
   device_get_mac_address
   device_set_wakeup_enable
   firmware_request_nowarn
   guid_gen
-  idr_for_each
-  ieee80211_alloc_hw_nm
-  ieee80211_beacon_cntdwn_is_complete
-  ieee80211_beacon_get_template
-  ieee80211_beacon_get_tim
-  ieee80211_beacon_loss
-  ieee80211_beacon_update_cntdwn
-  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_hdrlen
-  ieee80211_iterate_active_interfaces_atomic
-  ieee80211_iterate_stations_atomic
-  ieee80211_iter_chan_contexts_atomic
-  ieee80211_manage_rx_ba_offl
-  ieee80211_next_txq
-  ieee80211_proberesp_get
-  ieee80211_queue_delayed_work
-  ieee80211_queue_work
-  ieee80211_radar_detected
-  ieee80211_ready_on_channel
-  ieee80211_register_hw
-  ieee80211_remain_on_channel_expired
-  ieee80211_report_low_ack
-  ieee80211_restart_hw
-  ieee80211_rx_napi
-  ieee80211_scan_completed
-  __ieee80211_schedule_txq
-  ieee80211_sta_register_airtime
-  ieee80211_stop_queue
-  ieee80211_stop_queues
-  ieee80211_tdls_oper_request
-  ieee80211_tx_dequeue
-  ieee80211_txq_get_depth
-  ieee80211_txq_may_transmit
-  ieee80211_txq_schedule_start
-  ieee80211_tx_rate_update
-  ieee80211_tx_status
-  ieee80211_tx_status_irqsafe
-  ieee80211_unregister_hw
-  ieee80211_wake_queue
-  ieee80211_wake_queues
   init_dummy_netdev
-  init_uts_ns
   __kfifo_alloc
   __kfifo_free
-  __local_bh_enable_ip
-  __nla_parse
-  nla_put
   param_ops_ulong
-  regulatory_hint
-  skb_copy
   skb_dequeue_tail
-  skb_queue_head
   skb_realloc_headroom
   strlcat
   strscpy
-  __sw_hweight16
-  __sw_hweight8
   thermal_cooling_device_register
   vzalloc
-  wiphy_read_of_freq_limits
-  wiphy_rfkill_set_hw_state
-  wiphy_to_ieee80211_hw
 
 # required by ath10k_pci.ko
   pci_clear_master
@@ -801,11 +781,9 @@
   iommu_map
 
 # required by ax88179_178a.ko
-  ethtool_op_get_link
   ethtool_op_get_ts_info
   mii_ethtool_get_link_ksettings
   mii_ethtool_set_link_ksettings
-  netif_carrier_on
 
 # required by bam_dma.ko
   dma_async_device_register
@@ -815,7 +793,6 @@
   of_dma_controller_free
   of_dma_controller_register
   pm_runtime_irq_safe
-  tasklet_kill
   tasklet_setup
   vchan_dma_desc_free_list
   vchan_find_desc
@@ -823,6 +800,59 @@
   vchan_tx_desc_free
   vchan_tx_submit
 
+# required by cfg80211.ko
+  bpf_trace_run10
+  bpf_trace_run7
+  debugfs_rename
+  dev_change_net_namespace
+  __dev_get_by_index
+  dev_get_by_index
+  device_add
+  device_del
+  device_rename
+  genlmsg_multicast_allns
+  genlmsg_put
+  genl_register_family
+  genl_unregister_family
+  get_net_ns_by_fd
+  get_net_ns_by_pid
+  inet_csk_get_port
+  key_create_or_update
+  key_put
+  keyring_alloc
+  ktime_get_coarse_with_offset
+  memcmp
+  netif_rx_ni
+  netlink_broadcast
+  netlink_register_notifier
+  netlink_unicast
+  netlink_unregister_notifier
+  net_ns_type_operations
+  nla_find
+  nla_memcpy
+  nla_put_64bit
+  nla_reserve
+  __nla_validate
+  __put_net
+  rb_erase
+  rb_insert_color
+  register_pernet_device
+  request_firmware_nowait
+  rfkill_alloc
+  rfkill_blocked
+  rfkill_destroy
+  rfkill_pause_polling
+  rfkill_register
+  rfkill_resume_polling
+  rfkill_set_hw_state
+  rfkill_unregister
+  skb_add_rx_frag
+  __sock_create
+  trace_print_array_seq
+  unregister_pernet_device
+  verify_pkcs7_signature
+  wireless_nlevent_flush
+
 # required by clk-qcom.ko
   __clk_determine_rate
   clk_fixed_factor_ops
@@ -836,7 +866,6 @@
   __clk_mux_determine_rate_closest
   divider_ro_round_rate_parent
   of_find_node_opts_by_path
-  of_prop_next_u32
   pm_genpd_remove_subdomain
 
 # required by clk-rpmh.ko
@@ -858,7 +887,6 @@
   gpiod_get_value_cansleep
   gpiod_set_debounce
   gpiod_to_irq
-  system_power_efficient_wq
 
 # required by fastrpc.ko
   dma_buf_attach
@@ -925,9 +953,6 @@
   i2c_put_dma_safe_msg_buf
   of_machine_is_compatible
 
-# required by i2c-qup.ko
-  __usecs_to_jiffies
-
 # required by i2c-rk3x.ko
   clk_notifier_register
   clk_notifier_unregister
@@ -953,12 +978,88 @@
   mipi_dsi_device_unregister
   of_find_mipi_dsi_host_by_node
 
+# required by mac80211.ko
+  alloc_netdev_mqs
+  __alloc_percpu_gfp
+  arc4_crypt
+  arc4_setkey
+  call_rcu
+  crc32_be
+  crypto_aead_decrypt
+  crypto_aead_encrypt
+  crypto_aead_setauthsize
+  crypto_aead_setkey
+  crypto_alloc_aead
+  crypto_alloc_shash
+  crypto_alloc_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
+  dev_alloc_name
+  dev_fetch_sw_netstats
+  dev_printk
+  dev_queue_xmit
+  ether_setup
+  flush_delayed_work
+  free_netdev
+  free_percpu
+  get_random_u32
+  __hw_addr_init
+  __hw_addr_sync
+  __hw_addr_unsync
+  kernel_param_lock
+  kernel_param_unlock
+  kfree_skb_list
+  ktime_get_seconds
+  ktime_get_with_offset
+  napi_gro_receive
+  netdev_set_default_ethtool_ops
+  netif_carrier_off
+  netif_receive_skb
+  netif_receive_skb_list
+  netif_rx
+  netif_tx_stop_all_queues
+  netif_tx_wake_queue
+  net_ratelimit
+  __per_cpu_offset
+  prandom_bytes
+  prandom_u32
+  ___pskb_trim
+  rcu_barrier
+  register_inet6addr_notifier
+  register_inetaddr_notifier
+  register_netdevice
+  rhashtable_free_and_destroy
+  rhashtable_insert_slow
+  rhltable_init
+  __rht_bucket_nested
+  rht_bucket_nested
+  rht_bucket_nested_insert
+  round_jiffies
+  round_jiffies_relative
+  sg_init_one
+  skb_checksum_help
+  skb_clone_sk
+  skb_complete_wifi_ack
+  skb_ensure_writable
+  __skb_get_hash
+  __skb_gso_segment
+  system_freezable_wq
+  unregister_inet6addr_notifier
+  unregister_inetaddr_notifier
+  unregister_netdevice_many
+  unregister_netdevice_queue
+
 # required by msm.ko
   __bitmap_andnot
   __bitmap_weight
-  bpf_trace_run1
-  bpf_trace_run2
-  bpf_trace_run6
   bpf_trace_run8
   clk_get_parent
   __clk_hw_register_divider
@@ -975,10 +1076,8 @@
   component_master_add_with_match
   component_master_del
   component_unbind_all
-  _ctype
   debugfs_create_bool
   debugfs_create_u64
-  del_timer
   dev_coredumpm
   devfreq_recommended_opp
   devfreq_resume_device
@@ -1198,12 +1297,9 @@
   kthread_create_worker
   kthread_destroy_worker
   kthread_queue_work
-  kvfree
-  kvmalloc_node
   llist_add_batch
   memdup_user_nul
   memparse
-  memunmap
   mipi_dsi_create_packet
   mipi_dsi_host_register
   mipi_dsi_host_unregister
@@ -1211,20 +1307,16 @@
   mutex_lock_interruptible
   mutex_trylock_recursive
   nsecs_to_jiffies
-  nvmem_cell_get
-  nvmem_cell_put
   of_clk_hw_onecell_get
   of_device_is_available
   of_drm_find_bridge
   of_drm_find_panel
-  of_find_device_by_node
   of_find_matching_node_and_match
   of_get_compatible_child
   of_graph_get_endpoint_by_regs
   of_graph_get_next_endpoint
   of_graph_get_remote_port_parent
   of_icc_get
-  param_ops_charp
   phy_calibrate
   phy_configure
   pid_task
@@ -1240,7 +1332,6 @@
   regulator_get
   regulator_put
   reservation_ww_class
-  round_jiffies_up
   sched_set_fifo
   schedule_timeout_interruptible
   __sg_page_iter_dma_next
@@ -1280,7 +1371,6 @@
   dma_pool_create
   dma_pool_destroy
   dma_pool_free
-  flush_work
   free_pages
   gen_pool_dma_alloc_align
   gen_pool_dma_zalloc_align
@@ -1391,7 +1481,6 @@
   cpufreq_get_driver_data
   cpufreq_register_driver
   cpufreq_unregister_driver
-  __cpu_possible_mask
   dev_pm_opp_adjust_voltage
   dev_pm_opp_disable
   dev_pm_opp_enable
@@ -1450,9 +1539,6 @@
 
 # required by qcom_hwspinlock.ko
   devm_hwspin_lock_register
-  devm_regmap_field_alloc
-  regmap_field_read
-  regmap_field_update_bits_base
 
 # required by qcom_pil_info.ko
   __memset_io
@@ -1476,7 +1562,6 @@
   __num_online_cpus
 
 # required by qcom_spmi-regulator.ko
-  jiffies_to_usecs
   regulator_disable_regmap
   regulator_enable_regmap
   regulator_is_enabled_regmap
@@ -1486,14 +1571,16 @@
   rproc_get_by_child
   try_wait_for_completion
 
-# required by qrtr-smd.ko
+# required by qcom_tsens.ko
-  __pskb_pull_tail
+  debugfs_lookup
+  devm_thermal_zone_of_sensor_register
+  thermal_zone_device_update
+  thermal_zone_get_slope
 
 # required by qrtr-tun.ko
   _copy_to_iter
 
 # required by qrtr.ko
-  __alloc_skb
   autoremove_wake_function
   datagram_poll
   do_wait_intr_irq
@@ -1507,7 +1594,6 @@
   refcount_dec_and_mutex_lock
   release_sock
   sk_alloc
-  skb_copy_bits
   skb_copy_datagram_iter
   skb_free_datagram
   __skb_pad
@@ -1526,7 +1612,6 @@
   sock_queue_rcv_skb
   sock_register
   sock_unregister
-  synchronize_rcu
 
 # required by reboot-mode.ko
   devres_add
@@ -1545,8 +1630,6 @@
 
 # required by rmtfs_mem.ko
   alloc_chrdev_region
-  __class_register
-  class_unregister
 
 # required by rtc-pm8xxx.ko
   devm_request_any_context_irq
@@ -1605,9 +1688,6 @@
   snd_soc_of_parse_aux_devs
   snd_soc_of_parse_card_name
 
-# required by snd-soc-rl6231.ko
-  gcd
-
 # required by snd-soc-rt5663.ko
   regcache_cache_bypass
   snd_soc_add_component_controls
@@ -1666,7 +1746,6 @@
   spi_delay_exec
   spi_finalize_current_message
   spi_get_next_queued_message
-  tasklet_init
 
 # required by spmi-pmic-arb.ko
   irq_domain_set_info
@@ -1686,7 +1765,6 @@
   dma_sync_sg_for_cpu
   dma_sync_sg_for_device
   __free_pages
-  preempt_schedule
   __sg_page_iter_next
 
 # required by ufs_qcom.ko

android/abi_gki_aarch64_generic

@@ -115,35 +115,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_sched_scan_stopped_rtnl
-  __cfg80211_send_event_skb
-  cfg80211_unlink_bss
-  cfg80211_unregister_wdev
-  cfg80211_vendor_cmd_reply
   __cfi_slowpath
   __check_object_size
   __class_create
@@ -887,9 +858,6 @@
   idr_for_each
   idr_preload
   idr_remove
-  ieee80211_channel_to_freq_khz
-  ieee80211_freq_khz_to_channel
-  ieee80211_get_channel_khz
   iio_device_unregister
   import_iovec
   in6_pton
@@ -1503,7 +1471,6 @@
   regulator_set_voltage
   regulator_set_voltage_sel_regmap
   regulator_unregister
-  regulatory_hint
   release_firmware
   __release_region
   remap_pfn_range
@@ -2193,11 +2160,6 @@
   watchdog_register_device
   watchdog_set_restart_priority
   watchdog_unregister_device
-  wiphy_apply_custom_regulatory
-  wiphy_free
-  wiphy_new_nm
-  wiphy_register
-  wiphy_unregister
   woken_wake_function
   work_busy
   __xfrm_state_destroy

android/abi_gki_aarch64_hikey960

@@ -166,12 +166,6 @@
   ida_alloc_range
   ida_destroy
   ida_free
-  ieee80211_channel_to_freq_khz
-  ieee80211_connection_loss
-  ieee80211_find_sta
-  ieee80211_get_hdrlen_from_skb
-  ieee80211_queue_delayed_work
-  ieee80211_stop_rx_ba_session
   __init_swait_queue_head
   init_timer_key
   init_wait_entry
@@ -1225,17 +1219,10 @@
   tcpci_unregister_port
 
 # required by wl18xx.ko
-  __cfg80211_alloc_event_skb
-  __cfg80211_send_event_skb
-  ieee80211_radar_detected
   kstrtou8_from_user
 
 # required by wlcore.ko
   bcmp
-  __cfg80211_alloc_reply_skb
-  cfg80211_find_elem_match
-  cfg80211_find_vendor_elem
-  cfg80211_vendor_cmd_reply
   complete_all
   consume_skb
   device_create_bin_file
@@ -1244,40 +1231,6 @@
   dev_pm_set_dedicated_wake_irq
   disable_irq_nosync
   get_random_u32
-  ieee80211_alloc_hw_nm
-  ieee80211_ap_probereq_get
-  ieee80211_beacon_get_tim
-  ieee80211_chswitch_done
-  ieee80211_cqm_beacon_loss_notify
-  ieee80211_cqm_rssi_notify
-  ieee80211_csa_finish
-  ieee80211_free_hw
-  ieee80211_free_txskb
-  ieee80211_freq_khz_to_channel
-  ieee80211_hdrlen
-  ieee80211_iterate_active_interfaces_atomic
-  ieee80211_iterate_interfaces
-  ieee80211_nullfunc_get
-  ieee80211_probereq_get
-  ieee80211_proberesp_get
-  ieee80211_pspoll_get
-  ieee80211_queue_work
-  ieee80211_ready_on_channel
-  ieee80211_register_hw
-  ieee80211_remain_on_channel_expired
-  ieee80211_report_low_ack
-  ieee80211_restart_hw
-  ieee80211_rx_napi
-  ieee80211_scan_completed
-  ieee80211_sched_scan_results
-  ieee80211_sched_scan_stopped
-  ieee80211_sta_ps_transition
-  ieee80211_stop_queue
-  ieee80211_stop_queues
-  ieee80211_tx_status
-  ieee80211_unregister_hw
-  ieee80211_wake_queue
-  ieee80211_wake_queues
   jiffies_to_msecs
   jiffies_to_usecs
   __local_bh_enable_ip
@@ -1286,14 +1239,12 @@
   no_seek_end_llseek
   _raw_spin_trylock
   request_firmware_nowait
-  rfc1042_header
   skb_dequeue
   skb_push
   skb_put
   skb_queue_head
   skb_trim
   vscnprintf
-  wiphy_to_ieee80211_hw
 
 # required by wlcore_sdio.ko
   platform_device_add

android/abi_gki_aarch64_mtk

@@ -92,38 +92,6 @@
   cdev_device_add
   cdev_device_del
   cdev_init
-  __cfg80211_alloc_event_skb
-  __cfg80211_alloc_reply_skb
-  cfg80211_cac_event
-  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_radar_event
-  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_tdls_oper_request
-  cfg80211_unlink_bss
-  cfg80211_vendor_cmd_reply
   __cfi_slowpath
   __check_object_size
   check_preempt_curr
@@ -828,9 +796,6 @@
   idr_for_each
   idr_get_next
   idr_remove
-  ieee80211_channel_to_freq_khz
-  ieee80211_freq_khz_to_channel
-  ieee80211_get_channel_khz
   iio_alloc_pollfunc
   iio_buffer_init
   iio_buffer_put
@@ -1481,7 +1446,6 @@
   regulator_set_voltage_time
   regulator_set_voltage_time_sel
   regulator_sync_voltage
-  regulatory_hint
   release_firmware
   release_pages
   __release_region
@@ -2178,11 +2142,6 @@
   __warn_printk
   watchdog_init_timeout
   watchdog_set_restart_priority
-  wiphy_apply_custom_regulatory
-  wiphy_free
-  wiphy_new_nm
-  wiphy_register
-  wiphy_unregister
   wireless_send_event
   woken_wake_function
   work_busy

android/abi_gki_aarch64_qcom

@@ -121,37 +121,6 @@
   cdev_device_add
   cdev_device_del
   cdev_init
-  __cfg80211_alloc_event_skb
-  __cfg80211_alloc_reply_skb
-  cfg80211_calculate_bitrate
-  cfg80211_chandef_create
-  cfg80211_ch_switch_notify
-  cfg80211_connect_done
-  cfg80211_del_sta_sinfo
-  cfg80211_disconnected
-  cfg80211_external_auth_request
-  cfg80211_ft_event
-  cfg80211_get_bss
-  cfg80211_gtk_rekey_notify
-  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_remain_on_channel_expired
-  cfg80211_roamed
-  cfg80211_rx_mgmt_khz
-  cfg80211_rx_unprot_mlme_mgmt
-  cfg80211_scan_done
-  cfg80211_sched_scan_results
-  __cfg80211_send_event_skb
-  cfg80211_stop_iface
-  cfg80211_tdls_oper_request
-  cfg80211_unlink_bss
-  cfg80211_update_owe_info_event
-  cfg80211_vendor_cmd_reply
   __cfi_slowpath
   cgroup_path_ns
   cgroup_taskset_first
@@ -1084,9 +1053,6 @@
   idr_preload
   idr_remove
   idr_replace
-  ieee80211_freq_khz_to_channel
-  ieee80211_get_channel_khz
-  ieee80211_hdrlen
   iio_channel_get_all
   iio_read_channel_processed
   import_iovec
@@ -1960,7 +1926,6 @@
   regulator_set_mode
   regulator_set_voltage
   regulator_unregister_notifier
-  regulatory_set_wiphy_regd
   release_firmware
   __release_region
   release_sock
@@ -2902,10 +2867,6 @@
   wakeup_source_register
   wakeup_source_unregister
   __warn_printk
-  wiphy_free
-  wiphy_new_nm
-  wiphy_register
-  wiphy_unregister
   wireless_send_event
   woken_wake_function
   work_busy

android/abi_gki_aarch64_unisoc

@@ -317,9 +317,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
@@ -1956,40 +1953,11 @@
 # 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_mgmt
-  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
   console_printk
   consume_skb
   _ctype
   dev_get_by_index
   down_timeout
-  freq_reg_info
   genlmsg_put
   jiffies_to_usecs
   kfree_skb_list
@@ -2007,7 +1975,6 @@
   register_inet6addr_notifier
   register_inetaddr_notifier
   register_netdevice
-  regulatory_hint
   rtnl_lock
   rtnl_unlock
   simple_open
@@ -2017,10 +1984,6 @@
   unregister_inet6addr_notifier
   unregister_inetaddr_notifier
   unregister_netdevice_queue
-  wiphy_free
-  wiphy_new_nm
-  wiphy_register
-  wiphy_unregister
 
 # required by sunwave_fp.ko
   input_unregister_device

android/abi_gki_aarch64_virtual_device

@@ -34,8 +34,6 @@
   cancel_delayed_work_sync
   cancel_work_sync
   capable
-  cfg80211_inform_bss_data
-  cfg80211_put_bss
   __cfi_slowpath
   __check_object_size
   __class_create
@@ -565,10 +563,6 @@
 
 # required by mac80211_hwsim.ko
   alloc_netdev_mqs
-  __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
@@ -583,28 +577,6 @@
   hrtimer_forward
   hrtimer_init
   hrtimer_start_range_ns
-  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_status_irqsafe
-  ieee80211_unregister_hw
-  ieee80211_wake_queues
   init_net
   __netdev_alloc_skb
   netif_rx
@@ -619,7 +591,6 @@
   nla_put
   param_ops_ushort
   register_pernet_device
-  regulatory_hint
   rhashtable_destroy
   rhashtable_init
   rhashtable_insert_slow
@@ -635,7 +606,6 @@
   skb_trim
   skb_unlink
   unregister_pernet_device
-  wiphy_apply_custom_regulatory
 
 # required by md-mod.ko
   ack_all_badblocks
@@ -940,9 +910,6 @@
   devm_mfd_add_devices
 
 # required by virt_wifi.ko
-  cfg80211_connect_done
-  cfg80211_disconnected
-  cfg80211_scan_done
   __dev_get_by_index
   dev_printk
   __module_get
@@ -952,13 +919,8 @@
   rtnl_link_unregister
   skb_clone
   unregister_netdevice_many
-  wiphy_free
-  wiphy_new_nm
-  wiphy_register
-  wiphy_unregister
 
 # required by virt_wifi_sim.ko
-  ieee80211_get_channel_khz
   release_firmware
   request_firmware
 

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

@@ -266,11 +266,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_PCI=y
 CONFIG_PCIEPORTBUS=y

arch/x86/configs/gki_defconfig

@@ -242,11 +242,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_PCI=y
 CONFIG_PCIEPORTBUS=y