From 91f19a26c8dbb420cdb2bac3dfd96eb41f85109b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 30 Jun 2020 14:42:18 +0200 Subject: [PATCH] ANDROID: GKI: update ABI definitions based on recent wifi backports Leaf changes summary: 9 artifacts changed Changed leaf types summary: 9 leaf types changed Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 0 Added function Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable 'enum nl80211_attrs at nl80211.h:2380:1' changed: type size hasn't changed 7 enumerator insertions: 'nl80211_attrs::NL80211_ATTR_VLAN_ID' value '282' 'nl80211_attrs::NL80211_ATTR_HE_BSS_COLOR' value '283' 'nl80211_attrs::NL80211_ATTR_IFTYPE_AKM_SUITES' value '284' 'nl80211_attrs::NL80211_ATTR_TID_CONFIG' value '285' 'nl80211_attrs::NL80211_ATTR_CONTROL_PORT_NO_PREAUTH' value '286' 'nl80211_attrs::NL80211_ATTR_PMK_LIFETIME' value '287' 'nl80211_attrs::NL80211_ATTR_PMK_REAUTH_THRESHOLD' value '288' 3 enumerator changes: 'nl80211_attrs::NL80211_ATTR_MAX' from value '281' to '288' at nl80211.h:2469:1 'nl80211_attrs::NUM_NL80211_ATTR' from value '282' to '289' at nl80211.h:2469:1 'nl80211_attrs::__NL80211_ATTR_AFTER_LAST' from value '282' to '289' at nl80211.h:2469:1 2 impacted interfaces 'enum nl80211_commands at nl80211.h:1107:1' changed: type size hasn't changed 1 enumerator insertion: 'nl80211_commands::NL80211_CMD_SET_TID_CONFIG' value '137' 2 enumerator changes: 'nl80211_commands::NL80211_CMD_MAX' from value '136' to '137' at nl80211.h:1149:1 'nl80211_commands::__NL80211_CMD_AFTER_LAST' from value '137' to '138' at nl80211.h:1149:1 2 impacted interfaces 'struct cfg80211_ap_settings at cfg80211.h:992:1' changed: type size hasn't changed 1 data member insertion: 'cfg80211_he_bss_color cfg80211_ap_settings::he_bss_color', at offset 4120 (in bits) at cfg80211.h:1063:1 one impacted interface 'struct cfg80211_cached_keys at core.h:272:1' changed (indirectly): type size changed from 1472 to 1728 (in bits) there are data member changes: 'key_params cfg80211_cached_keys::params[4]' size changed from 1024 to 1280 (in bits) (by +256 bits) 'u8 cfg80211_cached_keys::data[4][13]' offset changed from 1024 to 1280 (in bits) (by +256 bits) 'int cfg80211_cached_keys::def' offset changed from 1440 to 1696 (in bits) (by +256 bits) 55 impacted interfaces 'struct cfg80211_ops at cfg80211.h:3632:1' changed: type size changed from 6976 to 7168 (in bits) 3 data member insertions: 'int (wiphy*, net_device*, typedef u8)* cfg80211_ops::set_default_beacon_key', at offset 704 (in bits) at cfg80211.h:3730:1 'int (wiphy*, net_device*, cfg80211_tid_config*)* cfg80211_ops::set_tid_config', at offset 7040 (in bits) at cfg80211.h:4020:1 'int (wiphy*, net_device*, const u8*, typedef u8)* cfg80211_ops::reset_tid_config', at offset 7104 (in bits) at cfg80211.h:4022:1 there are data member changes: 'int (wiphy*, net_device*, cfg80211_ap_settings*)* cfg80211_ops::start_ap' offset changed from 704 to 768 (in bits) (by +64 bits) 'int (wiphy*, net_device*, cfg80211_beacon_data*)* cfg80211_ops::change_beacon' offset changed from 768 to 832 (in bits) (by +64 bits) 'int (wiphy*, net_device*)* cfg80211_ops::stop_ap' offset changed from 832 to 896 (in bits) (by +64 bits) 'int (wiphy*, net_device*, const u8*, station_parameters*)* cfg80211_ops::add_station' offset changed from 896 to 960 (in bits) (by +64 bits) 'int (wiphy*, net_device*, station_del_parameters*)* cfg80211_ops::del_station' offset changed from 960 to 1024 (in bits) (by +64 bits) 'int (wiphy*, net_device*, const u8*, station_parameters*)* cfg80211_ops::change_station' offset changed from 1024 to 1088 (in bits) (by +64 bits) 'int (wiphy*, net_device*, const u8*, station_info*)* cfg80211_ops::get_station' offset changed from 1088 to 1152 (in bits) (by +64 bits) 'int (wiphy*, net_device*, int, u8*, station_info*)* cfg80211_ops::dump_station' offset changed from 1152 to 1216 (in bits) (by +64 bits) 'int (wiphy*, net_device*, const u8*, const u8*)* cfg80211_ops::add_mpath' offset changed from 1216 to 1280 (in bits) (by +64 bits) 'int (wiphy*, net_device*, const u8*)* cfg80211_ops::del_mpath' offset changed from 1280 to 1344 (in bits) (by +64 bits) 'int (wiphy*, net_device*, const u8*, const u8*)* cfg80211_ops::change_mpath' offset changed from 1344 to 1408 (in bits) (by +64 bits) 'int (wiphy*, net_device*, u8*, u8*, mpath_info*)* cfg80211_ops::get_mpath' offset changed from 1408 to 1472 (in bits) (by +64 bits) 'int (wiphy*, net_device*, int, u8*, u8*, mpath_info*)* cfg80211_ops::dump_mpath' offset changed from 1472 to 1536 (in bits) (by +64 bits) 'int (wiphy*, net_device*, u8*, u8*, mpath_info*)* cfg80211_ops::get_mpp' offset changed from 1536 to 1600 (in bits) (by +64 bits) 'int (wiphy*, net_device*, int, u8*, u8*, mpath_info*)* cfg80211_ops::dump_mpp' offset changed from 1600 to 1664 (in bits) (by +64 bits) 'int (wiphy*, net_device*, mesh_config*)* cfg80211_ops::get_mesh_config' offset changed from 1664 to 1728 (in bits) (by +64 bits) 'int (wiphy*, net_device*, typedef u32, const mesh_config*)* cfg80211_ops::update_mesh_config' offset changed from 1728 to 1792 (in bits) (by +64 bits) 'int (wiphy*, net_device*, const mesh_config*, const mesh_setup*)* cfg80211_ops::join_mesh' offset changed from 1792 to 1856 (in bits) (by +64 bits) 'int (wiphy*, net_device*)* cfg80211_ops::leave_mesh' offset changed from 1856 to 1920 (in bits) (by +64 bits) 'int (wiphy*, net_device*, ocb_setup*)* cfg80211_ops::join_ocb' offset changed from 1920 to 1984 (in bits) (by +64 bits) 'int (wiphy*, net_device*)* cfg80211_ops::leave_ocb' offset changed from 1984 to 2048 (in bits) (by +64 bits) 'int (wiphy*, net_device*, bss_parameters*)* cfg80211_ops::change_bss' offset changed from 2048 to 2112 (in bits) (by +64 bits) 'int (wiphy*, net_device*, ieee80211_txq_params*)* cfg80211_ops::set_txq_params' offset changed from 2112 to 2176 (in bits) (by +64 bits) 'int (wiphy*, net_device*, ieee80211_channel*)* cfg80211_ops::libertas_set_mesh_channel' offset changed from 2176 to 2240 (in bits) (by +64 bits) 'int (wiphy*, cfg80211_chan_def*)* cfg80211_ops::set_monitor_channel' offset changed from 2240 to 2304 (in bits) (by +64 bits) 'int (wiphy*, cfg80211_scan_request*)* cfg80211_ops::scan' offset changed from 2304 to 2368 (in bits) (by +64 bits) 'void (wiphy*, wireless_dev*)* cfg80211_ops::abort_scan' offset changed from 2368 to 2432 (in bits) (by +64 bits) 'int (wiphy*, net_device*, cfg80211_auth_request*)* cfg80211_ops::auth' offset changed from 2432 to 2496 (in bits) (by +64 bits) 'int (wiphy*, net_device*, cfg80211_assoc_request*)* cfg80211_ops::assoc' offset changed from 2496 to 2560 (in bits) (by +64 bits) 'int (wiphy*, net_device*, cfg80211_deauth_request*)* cfg80211_ops::deauth' offset changed from 2560 to 2624 (in bits) (by +64 bits) 'int (wiphy*, net_device*, cfg80211_disassoc_request*)* cfg80211_ops::disassoc' offset changed from 2624 to 2688 (in bits) (by +64 bits) 'int (wiphy*, net_device*, cfg80211_connect_params*)* cfg80211_ops::connect' offset changed from 2688 to 2752 (in bits) (by +64 bits) 'int (wiphy*, net_device*, cfg80211_connect_params*, typedef u32)* cfg80211_ops::update_connect_params' offset changed from 2752 to 2816 (in bits) (by +64 bits) 'int (wiphy*, net_device*, typedef u16)* cfg80211_ops::disconnect' offset changed from 2816 to 2880 (in bits) (by +64 bits) 'int (wiphy*, net_device*, cfg80211_ibss_params*)* cfg80211_ops::join_ibss' offset changed from 2880 to 2944 (in bits) (by +64 bits) 'int (wiphy*, net_device*)* cfg80211_ops::leave_ibss' offset changed from 2944 to 3008 (in bits) (by +64 bits) 'int (wiphy*, net_device*, int*)* cfg80211_ops::set_mcast_rate' offset changed from 3008 to 3072 (in bits) (by +64 bits) 'int (wiphy*, typedef u32)* cfg80211_ops::set_wiphy_params' offset changed from 3072 to 3136 (in bits) (by +64 bits) 'int (wiphy*, wireless_dev*, enum nl80211_tx_power_setting, int)* cfg80211_ops::set_tx_power' offset changed from 3136 to 3200 (in bits) (by +64 bits) 'int (wiphy*, wireless_dev*, int*)* cfg80211_ops::get_tx_power' offset changed from 3200 to 3264 (in bits) (by +64 bits) 'int (wiphy*, net_device*, const u8*)* cfg80211_ops::set_wds_peer' offset changed from 3264 to 3328 (in bits) (by +64 bits) 'void (wiphy*)* cfg80211_ops::rfkill_poll' offset changed from 3328 to 3392 (in bits) (by +64 bits) 'int (wiphy*, net_device*, const u8*, const cfg80211_bitrate_mask*)* cfg80211_ops::set_bitrate_mask' offset changed from 3392 to 3456 (in bits) (by +64 bits) 'int (wiphy*, net_device*, int, survey_info*)* cfg80211_ops::dump_survey' offset changed from 3456 to 3520 (in bits) (by +64 bits) 'int (wiphy*, net_device*, cfg80211_pmksa*)* cfg80211_ops::set_pmksa' offset changed from 3520 to 3584 (in bits) (by +64 bits) 'int (wiphy*, net_device*, cfg80211_pmksa*)* cfg80211_ops::del_pmksa' offset changed from 3584 to 3648 (in bits) (by +64 bits) 'int (wiphy*, net_device*)* cfg80211_ops::flush_pmksa' offset changed from 3648 to 3712 (in bits) (by +64 bits) 'int (wiphy*, wireless_dev*, ieee80211_channel*, unsigned int, u64*)* cfg80211_ops::remain_on_channel' offset changed from 3712 to 3776 (in bits) (by +64 bits) 'int (wiphy*, wireless_dev*, typedef u64)* cfg80211_ops::cancel_remain_on_channel' offset changed from 3776 to 3840 (in bits) (by +64 bits) 'int (wiphy*, wireless_dev*, cfg80211_mgmt_tx_params*, u64*)* cfg80211_ops::mgmt_tx' offset changed from 3840 to 3904 (in bits) (by +64 bits) 'int (wiphy*, wireless_dev*, typedef u64)* cfg80211_ops::mgmt_tx_cancel_wait' offset changed from 3904 to 3968 (in bits) (by +64 bits) 'int (wiphy*, net_device*, typedef bool, int)* cfg80211_ops::set_power_mgmt' offset changed from 3968 to 4032 (in bits) (by +64 bits) 'int (wiphy*, net_device*, typedef s32, typedef u32)* cfg80211_ops::set_cqm_rssi_config' offset changed from 4032 to 4096 (in bits) (by +64 bits) 'int (wiphy*, net_device*, typedef s32, typedef s32)* cfg80211_ops::set_cqm_rssi_range_config' offset changed from 4096 to 4160 (in bits) (by +64 bits) 'int (wiphy*, net_device*, typedef u32, typedef u32, typedef u32)* cfg80211_ops::set_cqm_txe_config' offset changed from 4160 to 4224 (in bits) (by +64 bits) 'void (wiphy*, wireless_dev*, typedef u16, typedef bool)* cfg80211_ops::mgmt_frame_register' offset changed from 4224 to 4288 (in bits) (by +64 bits) 'int (wiphy*, typedef u32, typedef u32)* cfg80211_ops::set_antenna' offset changed from 4288 to 4352 (in bits) (by +64 bits) 'int (wiphy*, u32*, u32*)* cfg80211_ops::get_antenna' offset changed from 4352 to 4416 (in bits) (by +64 bits) 'int (wiphy*, net_device*, cfg80211_sched_scan_request*)* cfg80211_ops::sched_scan_start' offset changed from 4416 to 4480 (in bits) (by +64 bits) 'int (wiphy*, net_device*, typedef u64)* cfg80211_ops::sched_scan_stop' offset changed from 4480 to 4544 (in bits) (by +64 bits) 'int (wiphy*, net_device*, cfg80211_gtk_rekey_data*)* cfg80211_ops::set_rekey_data' offset changed from 4544 to 4608 (in bits) (by +64 bits) 'int (wiphy*, net_device*, const u8*, typedef u8, typedef u8, typedef u16, typedef u32, typedef bool, const u8*, typedef size_t)* cfg80211_ops::tdls_mgmt' offset changed from 4608 to 4672 (in bits) (by +64 bits) 'int (wiphy*, net_device*, const u8*, enum nl80211_tdls_operation)* cfg80211_ops::tdls_oper' offset changed from 4672 to 4736 (in bits) (by +64 bits) 'int (wiphy*, net_device*, const u8*, u64*)* cfg80211_ops::probe_client' offset changed from 4736 to 4800 (in bits) (by +64 bits) 'int (wiphy*, net_device*, typedef u16)* cfg80211_ops::set_noack_map' offset changed from 4800 to 4864 (in bits) (by +64 bits) 'int (wiphy*, wireless_dev*, cfg80211_chan_def*)* cfg80211_ops::get_channel' offset changed from 4864 to 4928 (in bits) (by +64 bits) 'int (wiphy*, wireless_dev*)* cfg80211_ops::start_p2p_device' offset changed from 4928 to 4992 (in bits) (by +64 bits) 'void (wiphy*, wireless_dev*)* cfg80211_ops::stop_p2p_device' offset changed from 4992 to 5056 (in bits) (by +64 bits) 'int (wiphy*, net_device*, const cfg80211_acl_data*)* cfg80211_ops::set_mac_acl' offset changed from 5056 to 5120 (in bits) (by +64 bits) 'int (wiphy*, net_device*, cfg80211_chan_def*, typedef u32)* cfg80211_ops::start_radar_detection' offset changed from 5120 to 5184 (in bits) (by +64 bits) 'void (wiphy*, net_device*)* cfg80211_ops::end_cac' offset changed from 5184 to 5248 (in bits) (by +64 bits) 'int (wiphy*, net_device*, cfg80211_update_ft_ies_params*)* cfg80211_ops::update_ft_ies' offset changed from 5248 to 5312 (in bits) (by +64 bits) 'int (wiphy*, wireless_dev*, enum nl80211_crit_proto_id, typedef u16)* cfg80211_ops::crit_proto_start' offset changed from 5312 to 5376 (in bits) (by +64 bits) 'void (wiphy*, wireless_dev*)* cfg80211_ops::crit_proto_stop' offset changed from 5376 to 5440 (in bits) (by +64 bits) 'int (wiphy*, cfg80211_coalesce*)* cfg80211_ops::set_coalesce' offset changed from 5440 to 5504 (in bits) (by +64 bits) 'int (wiphy*, net_device*, cfg80211_csa_settings*)* cfg80211_ops::channel_switch' offset changed from 5504 to 5568 (in bits) (by +64 bits) 'int (wiphy*, net_device*, cfg80211_qos_map*)* cfg80211_ops::set_qos_map' offset changed from 5568 to 5632 (in bits) (by +64 bits) 'int (wiphy*, net_device*, cfg80211_chan_def*)* cfg80211_ops::set_ap_chanwidth' offset changed from 5632 to 5696 (in bits) (by +64 bits) 'int (wiphy*, net_device*, typedef u8, const u8*, typedef u8, typedef u16)* cfg80211_ops::add_tx_ts' offset changed from 5696 to 5760 (in bits) (by +64 bits) 'int (wiphy*, net_device*, typedef u8, const u8*)* cfg80211_ops::del_tx_ts' offset changed from 5760 to 5824 (in bits) (by +64 bits) 'int (wiphy*, net_device*, const u8*, typedef u8, cfg80211_chan_def*)* cfg80211_ops::tdls_channel_switch' offset changed from 5824 to 5888 (in bits) (by +64 bits) 'void (wiphy*, net_device*, const u8*)* cfg80211_ops::tdls_cancel_channel_switch' offset changed from 5888 to 5952 (in bits) (by +64 bits) 'int (wiphy*, wireless_dev*, cfg80211_nan_conf*)* cfg80211_ops::start_nan' offset changed from 5952 to 6016 (in bits) (by +64 bits) 'void (wiphy*, wireless_dev*)* cfg80211_ops::stop_nan' offset changed from 6016 to 6080 (in bits) (by +64 bits) 'int (wiphy*, wireless_dev*, cfg80211_nan_func*)* cfg80211_ops::add_nan_func' offset changed from 6080 to 6144 (in bits) (by +64 bits) 'void (wiphy*, wireless_dev*, typedef u64)* cfg80211_ops::del_nan_func' offset changed from 6144 to 6208 (in bits) (by +64 bits) 'int (wiphy*, wireless_dev*, cfg80211_nan_conf*, typedef u32)* cfg80211_ops::nan_change_conf' offset changed from 6208 to 6272 (in bits) (by +64 bits) 'int (wiphy*, net_device*, const bool)* cfg80211_ops::set_multicast_to_unicast' offset changed from 6272 to 6336 (in bits) (by +64 bits) 'int (wiphy*, wireless_dev*, cfg80211_txq_stats*)* cfg80211_ops::get_txq_stats' offset changed from 6336 to 6400 (in bits) (by +64 bits) 'int (wiphy*, net_device*, const cfg80211_pmk_conf*)* cfg80211_ops::set_pmk' offset changed from 6400 to 6464 (in bits) (by +64 bits) 'int (wiphy*, net_device*, const u8*)* cfg80211_ops::del_pmk' offset changed from 6464 to 6528 (in bits) (by +64 bits) 'int (wiphy*, net_device*, cfg80211_external_auth_params*)* cfg80211_ops::external_auth' offset changed from 6528 to 6592 (in bits) (by +64 bits) 'int (wiphy*, net_device*, const u8*, typedef size_t, const u8*, const __be16, const bool)* cfg80211_ops::tx_control_port' offset changed from 6592 to 6656 (in bits) (by +64 bits) 'int (wiphy*, net_device*, cfg80211_ftm_responder_stats*)* cfg80211_ops::get_ftm_responder_stats' offset changed from 6656 to 6720 (in bits) (by +64 bits) 'int (wiphy*, wireless_dev*, cfg80211_pmsr_request*)* cfg80211_ops::start_pmsr' offset changed from 6720 to 6784 (in bits) (by +64 bits) 'void (wiphy*, wireless_dev*, cfg80211_pmsr_request*)* cfg80211_ops::abort_pmsr' offset changed from 6784 to 6848 (in bits) (by +64 bits) 'int (wiphy*, net_device*, cfg80211_update_owe_info*)* cfg80211_ops::update_owe_info' offset changed from 6848 to 6912 (in bits) (by +64 bits) 'int (wiphy*, net_device*, const u8*, typedef size_t)* cfg80211_ops::probe_mesh_link' offset changed from 6912 to 6976 (in bits) (by +64 bits) one impacted interface 'struct cfg80211_pmksa at cfg80211.h:2624:1' changed: type size changed from 448 to 512 (in bits) 2 data member insertions: 'u32 cfg80211_pmksa::pmk_lifetime', at offset 448 (in bits) at cfg80211.h:2690:1 'u8 cfg80211_pmksa::pmk_reauth_threshold', at offset 480 (in bits) at cfg80211.h:2691:1 one impacted interface 'struct key_params at cfg80211.h:570:1' changed: type size changed from 256 to 320 (in bits) 1 data member insertion: 'u16 key_params::vlan_id', at offset 192 (in bits) at cfg80211.h:589:1 there are data member changes: 'u32 key_params::cipher' offset changed from 192 to 224 (in bits) (by +32 bits) 'nl80211_key_mode key_params::mode' offset changed from 224 to 256 (in bits) (by +32 bits) 55 impacted interfaces 'struct station_parameters at cfg80211.h:1155:1' changed: type size changed from 1152 to 1216 (in bits) 1 data member insertion: 'u16 station_parameters::vlan_id', at offset 272 (in bits) at cfg80211.h:1208:1 there are data member changes: 'u16 station_parameters::peer_aid' offset changed from 272 to 288 (in bits) (by +16 bits) 'u8 station_parameters::supported_rates_len' offset changed from 288 to 304 (in bits) (by +16 bits) 'u8 station_parameters::plink_action' offset changed from 296 to 312 (in bits) (by +16 bits) 'u8 station_parameters::plink_state' offset changed from 304 to 320 (in bits) (by +16 bits) 'const ieee80211_ht_cap* station_parameters::ht_capa' offset changed from 320 to 384 (in bits) (by +64 bits) 'const ieee80211_vht_cap* station_parameters::vht_capa' offset changed from 384 to 448 (in bits) (by +64 bits) 'u8 station_parameters::uapsd_queues' offset changed from 448 to 512 (in bits) (by +64 bits) 'u8 station_parameters::max_sp' offset changed from 456 to 520 (in bits) (by +64 bits) 'nl80211_mesh_power_mode station_parameters::local_pm' offset changed from 480 to 544 (in bits) (by +64 bits) 'u16 station_parameters::capability' offset changed from 512 to 576 (in bits) (by +64 bits) 'const u8* station_parameters::ext_capab' offset changed from 576 to 640 (in bits) (by +64 bits) 'u8 station_parameters::ext_capab_len' offset changed from 640 to 704 (in bits) (by +64 bits) 'const u8* station_parameters::supported_channels' offset changed from 704 to 768 (in bits) (by +64 bits) 'u8 station_parameters::supported_channels_len' offset changed from 768 to 832 (in bits) (by +64 bits) 'const u8* station_parameters::supported_oper_classes' offset changed from 832 to 896 (in bits) (by +64 bits) 'u8 station_parameters::supported_oper_classes_len' offset changed from 896 to 960 (in bits) (by +64 bits) 'u8 station_parameters::opmode_notif' offset changed from 904 to 968 (in bits) (by +64 bits) 'bool station_parameters::opmode_notif_used' offset changed from 912 to 976 (in bits) (by +64 bits) 'int station_parameters::support_p2p_ps' offset changed from 928 to 992 (in bits) (by +64 bits) 'const ieee80211_he_cap_elem* station_parameters::he_capa' offset changed from 960 to 1024 (in bits) (by +64 bits) 'u8 station_parameters::he_capa_len' offset changed from 1024 to 1088 (in bits) (by +64 bits) 'u16 station_parameters::airtime_weight' offset changed from 1040 to 1104 (in bits) (by +64 bits) 'sta_txpwr station_parameters::txpwr' offset changed from 1056 to 1120 (in bits) (by +64 bits) one impacted interface 'struct wiphy at cfg80211.h:4541:1' changed: type size changed from 10752 to 11008 (in bits) 3 data member insertions: 'const wiphy_iftype_akm_suites* wiphy::iftype_akm_suites', at offset 1088 (in bits) at cfg80211.h:4690:1 'unsigned int wiphy::num_iftype_akm_suites', at offset 1152 (in bits) at cfg80211.h:4691:1 'struct {u64 curr; u64 next;} wiphy::tid_config_support', at offset 10752 (in bits) at cfg80211.h:4792:1 there are data member changes: type 'u8[5]' of 'wiphy::ext_features' changed: type name changed from 'u8[5]' to 'u8[6]' array type size changed from 40 to 48 array type subrange 1 changed length from 5 to 6 'u8 wiphy::retry_short' offset changed from 1088 to 1184 (in bits) (by +96 bits) 'u8 wiphy::retry_long' offset changed from 1096 to 1192 (in bits) (by +96 bits) 'u32 wiphy::frag_threshold' offset changed from 1120 to 1216 (in bits) (by +96 bits) 'u32 wiphy::rts_threshold' offset changed from 1152 to 1248 (in bits) (by +96 bits) 'u8 wiphy::coverage_class' offset changed from 1184 to 1280 (in bits) (by +96 bits) 'char wiphy::fw_version[32]' offset changed from 1192 to 1288 (in bits) (by +96 bits) 'u32 wiphy::hw_version' offset changed from 1472 to 1568 (in bits) (by +96 bits) 'const wiphy_wowlan_support* wiphy::wowlan' offset changed from 1536 to 1600 (in bits) (by +64 bits) 'cfg80211_wowlan* wiphy::wowlan_config' offset changed from 1600 to 1664 (in bits) (by +64 bits) 'u16 wiphy::max_remain_on_channel_duration' offset changed from 1664 to 1728 (in bits) (by +64 bits) 'u8 wiphy::max_num_pmkids' offset changed from 1680 to 1744 (in bits) (by +64 bits) 'u32 wiphy::available_antennas_tx' offset changed from 1696 to 1760 (in bits) (by +64 bits) 'u32 wiphy::available_antennas_rx' offset changed from 1728 to 1792 (in bits) (by +64 bits) 'u32 wiphy::probe_resp_offload' offset changed from 1760 to 1824 (in bits) (by +64 bits) 'const u8* wiphy::extended_capabilities' offset changed from 1792 to 1856 (in bits) (by +64 bits) 'const u8* wiphy::extended_capabilities_mask' offset changed from 1856 to 1920 (in bits) (by +64 bits) 'u8 wiphy::extended_capabilities_len' offset changed from 1920 to 1984 (in bits) (by +64 bits) 'const wiphy_iftype_ext_capab* wiphy::iftype_ext_capab' offset changed from 1984 to 2048 (in bits) (by +64 bits) 'unsigned int wiphy::num_iftype_ext_capab' offset changed from 2048 to 2112 (in bits) (by +64 bits) 'void* wiphy::privid' offset changed from 2112 to 2176 (in bits) (by +64 bits) 'ieee80211_supported_band* wiphy::bands[4]' offset changed from 2176 to 2240 (in bits) (by +64 bits) 'void (wiphy*, regulatory_request*)* wiphy::reg_notifier' offset changed from 2432 to 2496 (in bits) (by +64 bits) 'const ieee80211_regdomain* wiphy::regd' offset changed from 2496 to 2560 (in bits) (by +64 bits) 'device wiphy::dev' offset changed from 2560 to 2624 (in bits) (by +64 bits) 'bool wiphy::registered' offset changed from 9664 to 9728 (in bits) (by +64 bits) 'dentry* wiphy::debugfsdir' offset changed from 9728 to 9792 (in bits) (by +64 bits) 'const ieee80211_ht_cap* wiphy::ht_capa_mod_mask' offset changed from 9792 to 9856 (in bits) (by +64 bits) 'const ieee80211_vht_cap* wiphy::vht_capa_mod_mask' offset changed from 9856 to 9920 (in bits) (by +64 bits) 'list_head wiphy::wdev_list' offset changed from 9920 to 9984 (in bits) (by +64 bits) 'possible_net_t wiphy::_net' offset changed from 10048 to 10112 (in bits) (by +64 bits) 'const wiphy_coalesce_support* wiphy::coalesce' offset changed from 10112 to 10176 (in bits) (by +64 bits) 'const wiphy_vendor_command* wiphy::vendor_commands' offset changed from 10176 to 10240 (in bits) (by +64 bits) 'const nl80211_vendor_cmd_info* wiphy::vendor_events' offset changed from 10240 to 10304 (in bits) (by +64 bits) 'int wiphy::n_vendor_commands' offset changed from 10304 to 10368 (in bits) (by +64 bits) 'int wiphy::n_vendor_events' offset changed from 10336 to 10400 (in bits) (by +64 bits) 'u16 wiphy::max_ap_assoc_sta' offset changed from 10368 to 10432 (in bits) (by +64 bits) 'u8 wiphy::max_num_csa_counters' offset changed from 10384 to 10448 (in bits) (by +64 bits) 'u8 wiphy::max_adj_channel_rssi_comp' offset changed from 10392 to 10456 (in bits) (by +64 bits) 'u32 wiphy::bss_select_support' offset changed from 10400 to 10464 (in bits) (by +64 bits) 'u8 wiphy::nan_supported_bands' offset changed from 10432 to 10496 (in bits) (by +64 bits) 'u32 wiphy::txq_limit' offset changed from 10464 to 10528 (in bits) (by +64 bits) 'u32 wiphy::txq_memory_limit' offset changed from 10496 to 10560 (in bits) (by +64 bits) 'u32 wiphy::txq_quantum' offset changed from 10528 to 10592 (in bits) (by +64 bits) 'const cfg80211_pmsr_capabilities* wiphy::pmsr_capa' offset changed from 10624 to 10688 (in bits) (by +64 bits) 'char wiphy::priv[]' offset changed from 10752 to 11008 (in bits) (by +256 bits) 55 impacted interfaces Bug: 154782456 Cc: Vamsi Krishna Signed-off-by: Greg Kroah-Hartman Change-Id: Iedf3fbe613b23059d976c3f8048818c6a89bc141 --- abi_gki_aarch64.xml | 4405 +++++++++++++++++++++---------------------- 1 file changed, 2191 insertions(+), 2214 deletions(-) diff --git a/abi_gki_aarch64.xml b/abi_gki_aarch64.xml index e3af0cdb1a61..70f5090fdf9c 100644 --- a/abi_gki_aarch64.xml +++ b/abi_gki_aarch64.xml @@ -15045,7 +15045,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -15089,6 +15167,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -15758,70 +15856,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -15834,26 +15868,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -16586,7 +16600,7 @@ - + @@ -17693,10 +17707,10 @@ - + - + @@ -26386,7 +26400,6 @@ - @@ -26470,7 +26483,7 @@ - + @@ -26518,55 +26531,56 @@ + - + - + - + - + - + - + - + - + - + @@ -28260,8 +28274,6 @@ - - @@ -28384,7 +28396,7 @@ - + @@ -28437,6 +28449,7 @@ + @@ -28491,6 +28504,7 @@ + @@ -28550,7 +28564,7 @@ - + @@ -28687,7 +28701,7 @@ - + @@ -30846,7 +30860,7 @@ - + @@ -30937,7 +30951,7 @@ - + @@ -31690,7 +31704,7 @@ - + @@ -31918,7 +31932,7 @@ - + @@ -31927,12 +31941,12 @@ - + - + @@ -31970,7 +31984,7 @@ - + @@ -31995,7 +32009,7 @@ - + @@ -32235,11 +32249,11 @@ - + - + @@ -32401,7 +32415,7 @@ - + @@ -32491,28 +32505,28 @@ - + - + - + - + - + @@ -33602,7 +33616,7 @@ - + @@ -33637,6 +33651,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -33647,6 +33699,7 @@ + @@ -34208,6 +34261,7 @@ + @@ -34837,7 +34891,7 @@ - + @@ -35395,7 +35449,7 @@ - + @@ -35425,7 +35479,7 @@ - + @@ -35434,7 +35488,7 @@ - + @@ -35737,13 +35791,13 @@ - + - + @@ -35828,7 +35882,7 @@ - + @@ -36226,7 +36280,7 @@ - + @@ -41032,7 +41086,7 @@ - + @@ -41061,7 +41115,7 @@ - + @@ -43207,7 +43261,7 @@ - + @@ -43673,7 +43727,7 @@ - + @@ -43710,7 +43764,7 @@ - + @@ -43921,7 +43975,7 @@ - + @@ -44908,10 +44962,10 @@ - + - + @@ -48345,7 +48399,7 @@ - + @@ -49008,7 +49062,7 @@ - + @@ -49970,7 +50024,7 @@ - + @@ -52755,10 +52809,10 @@ - + - + @@ -53256,7 +53310,7 @@ - + @@ -53280,7 +53334,7 @@ - + @@ -54092,15 +54146,213 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -54205,12 +54457,16 @@ + + + + @@ -56047,14 +56303,6 @@ - - - - - - - - @@ -56321,7 +56569,7 @@ - + @@ -56886,7 +57134,7 @@ - + @@ -56913,7 +57161,7 @@ - + @@ -56959,7 +57207,7 @@ - + @@ -57346,7 +57594,7 @@ - + @@ -58791,8 +59039,8 @@ - - + + @@ -59281,35 +59529,12 @@ - + - - - - - - - - - - - - - - - - - - - - - - - @@ -60481,7 +60706,7 @@ - + @@ -60654,7 +60879,6 @@ - @@ -60759,7 +60983,7 @@ - + @@ -61680,7 +61904,7 @@ - + @@ -61726,7 +61950,7 @@ - + @@ -61810,7 +62034,7 @@ - + @@ -62015,7 +62239,7 @@ - + @@ -64511,7 +64735,7 @@ - + @@ -64522,7 +64746,7 @@ - + @@ -66922,13 +67146,13 @@ - + - + - + @@ -66936,7 +67160,7 @@ - + @@ -69218,18 +69442,28 @@ - + - + - + + + + + + - + + + + + + - + @@ -69533,7 +69767,7 @@ - + @@ -69723,7 +69957,7 @@ - + @@ -69805,10 +70039,10 @@ - + - + @@ -69817,7 +70051,7 @@ - + @@ -69825,7 +70059,7 @@ - + @@ -69855,7 +70089,7 @@ - + @@ -69864,7 +70098,7 @@ - + @@ -70460,7 +70694,7 @@ - + @@ -70507,7 +70741,7 @@ - + @@ -70762,7 +70996,7 @@ - + @@ -72064,7 +72298,7 @@ - + @@ -72085,7 +72319,7 @@ - + @@ -80556,7 +80790,7 @@ - + @@ -80869,13 +81103,13 @@ - + - + @@ -80970,7 +81204,7 @@ - + @@ -81601,7 +81835,7 @@ - + @@ -81620,7 +81854,7 @@ - + @@ -81724,7 +81958,7 @@ - + @@ -82123,7 +82357,7 @@ - + @@ -82755,21 +82989,7 @@ - - - - - - - - - - - - - - - + @@ -82814,23 +83034,6 @@ - - - - - - - - - - - - - - - - - @@ -83115,7 +83318,7 @@ - + @@ -83131,10 +83334,10 @@ - + - + @@ -83142,14 +83345,31 @@ + + + + + + + + + + + + + + + + + - + - + - + @@ -83158,7 +83378,7 @@ - + @@ -83192,9 +83412,9 @@ - + - + @@ -83397,7 +83617,7 @@ - + @@ -83499,7 +83719,7 @@ - + @@ -83527,7 +83747,7 @@ - + @@ -83781,7 +84001,7 @@ - + @@ -83793,12 +84013,12 @@ - + - + @@ -83818,7 +84038,7 @@ - + @@ -83949,8 +84169,7 @@ - - + @@ -83964,8 +84183,6 @@ - - @@ -84066,7 +84283,7 @@ - + @@ -84081,7 +84298,7 @@ - + @@ -84140,7 +84357,7 @@ - + @@ -84876,7 +85093,7 @@ - + @@ -84890,9 +85107,9 @@ - + - + @@ -84901,7 +85118,7 @@ - + @@ -85564,7 +85781,7 @@ - + @@ -85612,15 +85829,15 @@ - + - + - + @@ -86259,7 +86476,7 @@ - + @@ -86704,7 +86921,7 @@ - + @@ -87396,7 +87613,7 @@ - + @@ -88382,7 +88599,7 @@ - + @@ -89806,7 +90023,7 @@ - + @@ -89830,7 +90047,7 @@ - + @@ -91906,7 +92123,7 @@ - + @@ -91953,7 +92170,7 @@ - + @@ -92001,10 +92218,10 @@ - + - + @@ -92170,7 +92387,7 @@ - + @@ -92203,7 +92420,7 @@ - + @@ -93391,10 +93608,10 @@ - + - + @@ -96402,7 +96619,7 @@ - + @@ -97544,7 +97761,7 @@ - + @@ -97560,7 +97777,7 @@ - + @@ -97574,7 +97791,7 @@ - + @@ -97677,7 +97894,7 @@ - + @@ -97691,7 +97908,7 @@ - + @@ -97968,7 +98185,7 @@ - + @@ -98753,7 +98970,7 @@ - + @@ -98936,7 +99153,7 @@ - + @@ -98981,7 +99198,7 @@ - + @@ -99324,10 +99541,10 @@ - + - + @@ -99962,7 +100179,7 @@ - + @@ -99971,7 +100188,7 @@ - + @@ -100057,7 +100274,7 @@ - + @@ -100424,6 +100641,23 @@ + + + + + + + + + + + + + + + + + @@ -100512,10 +100746,10 @@ - + - + @@ -100840,7 +101074,7 @@ - + @@ -101708,7 +101942,7 @@ - + @@ -101765,7 +101999,7 @@ - + @@ -102689,7 +102923,7 @@ - + @@ -102705,7 +102939,7 @@ - + @@ -102716,6 +102950,14 @@ + + + + + + + + @@ -103084,7 +103326,7 @@ - + @@ -103713,6 +103955,25 @@ + + + + + + + + + + + + + + + + + + + @@ -103821,173 +104082,40 @@ - + - + - + - - - + + + - - + + - - + + - - + + - - + + + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -104316,7 +104444,18 @@ - + + + + + + + + + + + + @@ -104324,7 +104463,7 @@ - + @@ -104418,51 +104557,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -104744,7 +104838,7 @@ - + @@ -105103,7 +105197,7 @@ - + @@ -105166,7 +105260,7 @@ - + @@ -105385,7 +105479,7 @@ - + @@ -105674,10 +105768,10 @@ - + - + @@ -105751,23 +105845,12 @@ - + - + - - - - - - - - - - - - + @@ -105951,7 +106034,18 @@ - + + + + + + + + + + + + @@ -105959,7 +106053,7 @@ - + @@ -105967,7 +106061,7 @@ - + @@ -105978,23 +106072,7 @@ - - - - - - - - - - - - - - - - - + @@ -106020,7 +106098,7 @@ - + @@ -106554,7 +106632,7 @@ - + @@ -106723,7 +106801,7 @@ - + @@ -106731,7 +106809,7 @@ - + @@ -106745,7 +106823,7 @@ - + @@ -106753,7 +106831,7 @@ - + @@ -106769,7 +106847,7 @@ - + @@ -107219,7 +107297,7 @@ - + @@ -107806,7 +107884,7 @@ - + @@ -107816,7 +107894,7 @@ - + @@ -108514,7 +108592,7 @@ - + @@ -108522,7 +108600,7 @@ - + @@ -108538,7 +108616,7 @@ - + @@ -108546,7 +108624,7 @@ - + @@ -108600,15 +108678,15 @@ - + - + - + @@ -108624,7 +108702,7 @@ - + @@ -108651,7 +108729,7 @@ - + @@ -108662,7 +108740,7 @@ - + @@ -108700,7 +108778,7 @@ - + @@ -108778,7 +108856,7 @@ - + @@ -108909,18 +108987,10 @@ - - - - - - - - @@ -109160,45 +109230,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -109206,24 +109238,7 @@ - - - - - - - - - - - - - - - - - - + @@ -109234,122 +109249,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -109378,14 +109277,10 @@ - - - - @@ -109562,17 +109457,6 @@ - - - - - - - - - - - @@ -109782,10 +109666,10 @@ - + - + @@ -109940,7 +109824,7 @@ - + @@ -109958,7 +109842,7 @@ - + @@ -110273,7 +110157,7 @@ - + @@ -110657,7 +110541,7 @@ - + @@ -110901,7 +110785,7 @@ - + @@ -110910,7 +110794,7 @@ - + @@ -110918,10 +110802,10 @@ - + - + @@ -110940,7 +110824,15 @@ - + + + + + + + + + @@ -111201,7 +111093,7 @@ - + @@ -111216,6 +111108,10 @@ + + + + @@ -111238,7 +111134,7 @@ - + @@ -111284,592 +111180,612 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - + - + - + - + - - + + - - + + + + + + + + + + + - + - - - - - - - + - + + + + - + - + + + + - + - + - + - + - + - + - - + + - + - + - - + + - + - + - + - + - - + + - + - + - + - - - - + - - - - - - - + - + - + + + + + + + - + - + - + + + + + + + - + - + - - + + - + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + - - - - + - + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -111877,132 +111793,132 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -112020,38 +111936,41 @@ - + - + - + - + - + - + - + - + - + - + + + + - + @@ -112097,57 +112016,57 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -112194,47 +112113,47 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -112245,15 +112164,15 @@ - + - + - + - + @@ -112282,50 +112201,50 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -112342,21 +112261,21 @@ - + - + - + - + - + - + @@ -112373,15 +112292,15 @@ - + - + - + - + @@ -112398,26 +112317,26 @@ - + - + - + - + - + - + - + - + @@ -112480,20 +112399,20 @@ - + - + - + @@ -112612,627 +112531,639 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -113246,7 +113177,7 @@ - + @@ -113254,42 +113185,42 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -113306,99 +113237,113 @@ - + - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -113407,506 +113352,506 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -113914,302 +113859,302 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -114218,166 +114163,172 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -114385,18 +114336,18 @@ - + - + - + - + - + @@ -114404,175 +114355,175 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -114580,181 +114531,211 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -114789,6 +114770,7 @@ + @@ -114834,6 +114816,8 @@ + + @@ -114871,6 +114855,7 @@ + @@ -114885,6 +114870,7 @@ + @@ -114973,7 +114959,7 @@ - + @@ -115127,6 +115113,12 @@ + + + + + + @@ -115222,6 +115214,13 @@ + + + + + + + @@ -115619,7 +115618,7 @@ - + @@ -115678,7 +115677,7 @@ - + @@ -115686,7 +115685,29 @@ - + + + + + + + + + + + + + + + + + + + + + + + @@ -115697,15 +115718,7 @@ - - - - - - - - - + @@ -115849,10 +115862,11 @@ - - + + + - + @@ -116136,196 +116150,203 @@ - - - + + + + + + + + + + - + - + - + - + - + - + - + - - - - - - - - - + + + + + + + + + - - - + + + - - - - - + + + + + - - + + - - - - + + + + - - - - - - + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - - + + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + - - - + + + - - - - - - + + + + + + - - - + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -116342,34 +116363,34 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -116394,7 +116415,7 @@ - + @@ -116424,7 +116445,7 @@ - + @@ -116438,33 +116459,33 @@ - + - + - + - + - + - + - + - + - + - + @@ -116490,24 +116511,24 @@ - + - + - + - + - + - + @@ -116542,12 +116563,12 @@ - + - + @@ -116558,7 +116579,7 @@ - + @@ -116629,10 +116650,10 @@ - + - + @@ -116998,7 +117019,7 @@ - + @@ -117013,89 +117034,89 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -117112,13 +117133,13 @@ - - - - - - - + + + + + + + @@ -117127,61 +117148,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -117197,8 +117163,8 @@ - - + + @@ -117213,43 +117179,43 @@ - - + + - - + + - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - + + + - - - + + + - + @@ -117258,8 +117224,8 @@ - - + + @@ -117273,7 +117239,7 @@ - + @@ -117425,7 +117391,18 @@ - + + + + + + + + + + + + @@ -117447,13 +117424,13 @@ - + - + @@ -117637,7 +117614,7 @@ - + @@ -118383,7 +118360,7 @@ - + @@ -118393,15 +118370,15 @@ - + - + - + @@ -118418,7 +118395,7 @@ - + @@ -118429,7 +118406,7 @@ - + @@ -118480,10 +118457,10 @@ - + - + @@ -118505,7 +118482,7 @@ - + @@ -118513,7 +118490,7 @@ - + @@ -118614,13 +118591,13 @@ - + - + @@ -119522,7 +119499,7 @@ - + @@ -119690,7 +119667,7 @@ - + @@ -120507,10 +120484,10 @@ - + - + @@ -121600,7 +121577,6 @@ - @@ -122537,6 +122513,7 @@ + @@ -122677,7 +122654,7 @@ - + @@ -123309,7 +123286,7 @@ - +