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_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
@@ -2195,11 +2162,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
@@ -829,9 +797,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
@@ -1482,7 +1447,6 @@
   regulator_set_voltage_time
   regulator_set_voltage_time_sel
   regulator_sync_voltage
-  regulatory_hint
   release_firmware
   release_pages
   __release_region
@@ -2179,11 +2143,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
@@ -2923,10 +2888,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

@@ -268,11 +268,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

@@ -244,11 +244,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