tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: GKI: the "reusachtig" padding sync with android16-6.12

Browse Source 
Add the initial set of ABI padding fields in android16-6.12 based on what
is in the android15-6.6 branch.

Bug: 151154716
Change-Id: Icdb394863b2911389bfdced0fd1ea20236ca4ce1
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Signed-off-by: Carlos Llamas <cmllamas@google.com>
This commit is contained in:
Greg Kroah-Hartman
2024-02-29 10:29:40 +00:00
committed by Carlos Llamas
parent 20159aa0ac
commit 75adb09e2f
140 changed files with 1149 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/net/bluetooth/hci_core.h
+19
View File
@@ -29,6 +29,7 @@
#include <linux/idr.h>
#include <linux/leds.h>
#include <linux/rculist.h>
#include <linux/android_kabi.h>
#include <net/bluetooth/hci.h>
#include <net/bluetooth/hci_drv.h>
@@ -643,6 +644,11 @@ struct hci_dev {
struct bt_codec *codec, __u8 *vnd_len,
__u8 **vnd_data);
u8 (*classify_pkt_type)(struct hci_dev *hdev, struct sk_buff *skb);
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
ANDROID_KABI_RESERVE(3);
ANDROID_KABI_RESERVE(4);
};
#define HCI_PHY_HANDLE(handle) (handle & 0xff)
@@ -759,6 +765,11 @@ struct hci_conn {
void (*disconn_cfm_cb) (struct hci_conn *conn, u8 reason);
void (*cleanup)(struct hci_conn *conn);
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
ANDROID_KABI_RESERVE(3);
ANDROID_KABI_RESERVE(4);
};
struct hci_link {
@@ -773,6 +784,8 @@ struct hci_chan {
struct sk_buff_head data_q;
unsigned int sent;
__u8 state;
ANDROID_KABI_RESERVE(1);
};
struct hci_conn_params {
@@ -801,6 +814,8 @@ struct hci_conn_params {
/* Accessed without hdev->lock: */
hci_conn_flags_t flags;
u8 privacy_mode;
ANDROID_KABI_RESERVE(1);
};
extern struct list_head hci_dev_list;
@@ -2015,6 +2030,8 @@ struct hci_cb {
__u8 encrypt);
void (*key_change_cfm) (struct hci_conn *conn, __u8 status);
void (*role_switch_cfm) (struct hci_conn *conn, __u8 status, __u8 role);
ANDROID_KABI_RESERVE(1);
};
static inline void hci_connect_cfm(struct hci_conn *conn, __u8 status)
@@ -2261,6 +2278,8 @@ struct hci_mgmt_chan {
size_t handler_count;
const struct hci_mgmt_handler *handlers;
void (*hdev_init) (struct sock *sk, struct hci_dev *hdev);
ANDROID_KABI_RESERVE(1);
};
int hci_mgmt_chan_register(struct hci_mgmt_chan *c);
include/net/bluetooth/l2cap.h
+10
View File
@@ -29,6 +29,7 @@
#include <linux/unaligned.h>
#include <linux/atomic.h>
#include <linux/android_kabi.h>
/* L2CAP defaults */
#define L2CAP_DEFAULT_MTU 672
@@ -612,6 +613,9 @@ struct l2cap_chan {
void *data;
const struct l2cap_ops *ops;
struct mutex lock;
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
};
struct l2cap_ops {
@@ -636,6 +640,9 @@ struct l2cap_ops {
unsigned long len, int nb);
int (*filter) (struct l2cap_chan * chan,
struct sk_buff *skb);
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
};
struct l2cap_conn {
@@ -671,6 +678,9 @@ struct l2cap_conn {
struct mutex lock;
struct kref ref;
struct list_head users;
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
};
struct l2cap_user {
include/net/bluetooth/rfcomm.h
+6
View File
@@ -22,6 +22,7 @@
*/
#include <linux/refcount.h>
#include <linux/android_kabi.h>
#ifndef __RFCOMM_H
#define __RFCOMM_H
@@ -164,6 +165,8 @@ struct rfcomm_session {
uint mtu;
struct list_head dlcs;
ANDROID_KABI_RESERVE(1);
};
struct rfcomm_dlc {
@@ -197,6 +200,9 @@ struct rfcomm_dlc {
void (*data_ready)(struct rfcomm_dlc *d, struct sk_buff *skb);
void (*state_change)(struct rfcomm_dlc *d, int err);
void (*modem_status)(struct rfcomm_dlc *d, u8 v24_sig);
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
};
/* DLC and session flags */
include/net/cfg80211.h
+44
View File
@@ -23,6 +23,7 @@
#include <linux/ieee80211.h>
#include <linux/net.h>
#include <linux/rfkill.h>
#include <linux/android_kabi.h>
#include <net/regulatory.h>
/**
@@ -1280,6 +1281,8 @@ struct cfg80211_crypto_settings {
const u8 *sae_pwd;
u8 sae_pwd_len;
enum nl80211_sae_pwe_mechanism sae_pwe;
ANDROID_KABI_RESERVE(1);
};
/**
@@ -1385,6 +1388,8 @@ struct cfg80211_beacon_data {
size_t civicloc_len;
struct cfg80211_he_bss_color he_bss_color;
bool he_bss_color_valid;
ANDROID_KABI_RESERVE(1);
};
struct mac_address {
@@ -1519,6 +1524,8 @@ struct cfg80211_ap_settings {
struct cfg80211_fils_discovery fils_discovery;
struct cfg80211_unsol_bcast_probe_resp unsol_bcast_probe_resp;
struct cfg80211_mbssid_config mbssid_config;
ANDROID_KABI_RESERVE(1);
};
@@ -1535,6 +1542,8 @@ struct cfg80211_ap_update {
struct cfg80211_beacon_data beacon;
struct cfg80211_fils_discovery fils_discovery;
struct cfg80211_unsol_bcast_probe_resp unsol_bcast_probe_resp;
ANDROID_KABI_RESERVE(1);
};
/**
@@ -1567,6 +1576,8 @@ struct cfg80211_csa_settings {
bool block_tx;
u8 count;
u8 link_id;
ANDROID_KABI_RESERVE(1);
};
/**
@@ -1694,6 +1705,8 @@ struct link_station_parameters {
const struct ieee80211_he_6ghz_capa *he_6ghz_capa;
const struct ieee80211_eht_cap_elem *eht_capa;
u8 eht_capa_len;
ANDROID_KABI_RESERVE(1);
};
/**
@@ -2184,6 +2197,8 @@ struct station_info {
u8 mld_addr[ETH_ALEN] __aligned(2);
const u8 *assoc_resp_ies;
size_t assoc_resp_ies_len;
ANDROID_KABI_RESERVE(1);
};
/**
@@ -2491,6 +2506,8 @@ struct mesh_config {
u16 dot11MeshAwakeWindowDuration;
u32 plink_timeout;
bool dot11MeshNolearn;
ANDROID_KABI_RESERVE(1);
};
/**
@@ -2540,6 +2557,8 @@ struct mesh_setup {
struct cfg80211_bitrate_mask beacon_rate;
bool userspace_handles_dfs;
bool control_port_over_nl80211;
ANDROID_KABI_RESERVE(1);
};
/**
@@ -2706,6 +2725,8 @@ struct cfg80211_scan_request {
struct cfg80211_scan_6ghz_params *scan_6ghz_params;
s8 tsf_report_link_id;
ANDROID_KABI_RESERVE(1);
/* keep last */
struct ieee80211_channel *channels[] __counted_by(n_channels);
};
@@ -2842,6 +2863,8 @@ struct cfg80211_sched_scan_request {
bool nl_owner_dead;
struct list_head list;
ANDROID_KABI_RESERVE(1);
/* keep last */
struct ieee80211_channel *channels[] __counted_by(n_channels);
};
@@ -2985,6 +3008,7 @@ struct cfg80211_bss {
u8 use_for;
u8 cannot_use_reasons;
ANDROID_KABI_RESERVE(1);
u8 priv[] __aligned(sizeof(void *));
};
@@ -3172,6 +3196,8 @@ struct cfg80211_assoc_request {
struct cfg80211_assoc_link links[IEEE80211_MLD_MAX_NUM_LINKS];
const u8 *ap_mld_addr;
s8 link_id;
ANDROID_KABI_RESERVE(1);
};
/**
@@ -3270,6 +3296,8 @@ struct cfg80211_ibss_params {
struct ieee80211_ht_cap ht_capa_mask;
struct key_params *wep_keys;
int wep_tx_key;
ANDROID_KABI_RESERVE(1);
};
/**
@@ -3384,6 +3412,8 @@ struct cfg80211_connect_params {
size_t fils_erp_rrk_len;
bool want_1x;
struct ieee80211_edmg edmg;
ANDROID_KABI_RESERVE(1);
};
/**
@@ -3848,6 +3878,8 @@ struct cfg80211_nan_func {
u8 num_rx_filters;
u8 instance_id;
u64 cookie;
ANDROID_KABI_RESERVE(1);
};
/**
@@ -4020,6 +4052,8 @@ struct cfg80211_pmsr_ftm_result {
dist_avg_valid:1,
dist_variance_valid:1,
dist_spread_valid:1;
ANDROID_KABI_RESERVE(1);
};
/**
@@ -4970,6 +5004,11 @@ struct cfg80211_ops {
int (*assoc_ml_reconf)(struct wiphy *wiphy, struct net_device *dev,
struct cfg80211_assoc_link *add_links,
u16 rem_links);
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
ANDROID_KABI_RESERVE(3);
ANDROID_KABI_RESERVE(4);
};
/*
@@ -5347,6 +5386,8 @@ struct wiphy_vendor_command {
unsigned long *storage);
const struct nla_policy *policy;
unsigned int maxattr;
ANDROID_KABI_RESERVE(1);
};
/**
@@ -5842,6 +5883,7 @@ struct wiphy {
int n_radio;
const struct wiphy_radio *radio;
ANDROID_KABI_RESERVE(1);
char priv[] __aligned(NETDEV_ALIGN);
};
@@ -6406,6 +6448,8 @@ struct wireless_dev {
u16 valid_links;
u32 radio_mask;
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
};
static inline const u8 *wdev_address(struct wireless_dev *wdev)
include/net/genetlink.h
+5
View File
@@ -3,6 +3,7 @@
#define __NET_GENERIC_NETLINK_H
#include <linux/net.h>
#include <linux/android_kabi.h>
#include <net/netlink.h>
#include <net/net_namespace.h>
#include <uapi/linux/genetlink.h>
@@ -113,6 +114,8 @@ struct genl_family {
unsigned int mcgrp_offset;
/* list of per-socket privs */
struct xarray *sock_privs;
ANDROID_KABI_RESERVE(1);
};
/**
@@ -219,6 +222,8 @@ struct genl_ops {
u8 internal_flags;
u8 flags;
u8 validate;
ANDROID_KABI_RESERVE(1);
};
/**
include/net/inet_connection_sock.h
+5
View File
@@ -17,6 +17,7 @@
#include <linux/poll.h>
#include <linux/kernel.h>
#include <linux/sockptr.h>
#include <linux/android_kabi.h>
#include <net/inet_sock.h>
#include <net/request_sock.h>
@@ -51,6 +52,8 @@ struct inet_connection_sock_af_ops {
char __user *optval, int __user *optlen);
void (*addr2sockaddr)(struct sock *sk, struct sockaddr *);
void (*mtu_reduced)(struct sock *sk);
ANDROID_KABI_RESERVE(1);
};
/** inet_connection_sock - INET connection oriented sock
@@ -137,6 +140,8 @@ struct inet_connection_sock {
u32 icsk_probes_tstamp;
u32 icsk_user_timeout;
ANDROID_KABI_RESERVE(1);
u64 icsk_ca_priv[104 / sizeof(u64)];
#define ICSK_CA_PRIV_SIZE sizeof_field(struct inet_connection_sock, icsk_ca_priv)
};
include/net/inet_sock.h
+4
View File
@@ -17,6 +17,7 @@
#include <linux/types.h>
#include <linux/jhash.h>
#include <linux/netdevice.h>
#include <linux/android_kabi.h>
#include <net/flow.h>
#include <net/sock.h>
@@ -239,6 +240,9 @@ struct inet_sock {
struct ip_mc_socklist __rcu *mc_list;
struct inet_cork_full cork;
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
};
#define IPCORK_OPT 1 /* ip-options has been held in ipcork.opt */
include/net/ip.h
+2
View File
@@ -25,6 +25,7 @@
#include <linux/jhash.h>
#include <linux/sockptr.h>
#include <linux/static_key.h>
#include <linux/android_kabi.h>
#include <net/inet_sock.h>
#include <net/route.h>
@@ -83,6 +84,7 @@ struct ipcm_cookie {
__s16 tos;
char priority;
__u16 gso_size;
ANDROID_KABI_RESERVE(1);
};
static inline void ipcm_init(struct ipcm_cookie *ipcm)
include/net/ip6_fib.h
+10
View File
@@ -13,6 +13,7 @@
#include <linux/rtnetlink.h>
#include <linux/spinlock.h>
#include <linux/notifier.h>
#include <linux/android_kabi.h>
#include <net/dst.h>
#include <net/flow.h>
#include <net/ip_fib.h>
@@ -62,6 +63,8 @@ struct fib6_config {
struct nlattr *fc_encap;
u16 fc_encap_type;
bool fc_is_fdb;
ANDROID_KABI_RESERVE(1);
};
struct fib6_node {
@@ -78,6 +81,8 @@ struct fib6_node {
int fn_sernum;
struct fib6_info __rcu *rr_ptr;
struct rcu_head rcu;
ANDROID_KABI_RESERVE(1);
};
struct fib6_gc_args {
@@ -200,6 +205,9 @@ struct fib6_info {
struct rcu_head rcu;
struct nexthop *nh;
ANDROID_KABI_RESERVE(1);
struct fib6_nh fib6_nh[];
};
@@ -216,6 +224,8 @@ struct rt6_info {
/* more non-fragment space at head required */
unsigned short rt6i_nfheader_len;
ANDROID_KABI_RESERVE(1);
};
struct fib6_result {
include/net/mac80211.h
+24
View File
@@ -19,6 +19,7 @@
#include <linux/skbuff.h>
#include <linux/ieee80211.h>
#include <linux/lockdep.h>
#include <linux/android_kabi.h>
#include <net/cfg80211.h>
#include <net/codel.h>
#include <net/ieee80211_radiotap.h>
@@ -834,6 +835,8 @@ struct ieee80211_bss_conf {
bool eht_su_beamformee;
bool eht_mu_beamformer;
bool eht_80mhz_full_bw_ul_mumimo;
ANDROID_KABI_RESERVE(1);
};
/**
@@ -1275,6 +1278,9 @@ struct ieee80211_tx_info {
void *rate_driver_data[
IEEE80211_TX_INFO_RATE_DRIVER_DATA_SIZE / sizeof(void *)];
};
ANDROID_KABI_RESERVE(1);
void *driver_data[
IEEE80211_TX_INFO_DRIVER_DATA_SIZE / sizeof(void *)];
};
@@ -1789,6 +1795,8 @@ struct ieee80211_conf {
struct cfg80211_chan_def chandef;
bool radar_enabled;
enum ieee80211_smps_mode smps_mode;
ANDROID_KABI_RESERVE(1);
};
/**
@@ -2035,6 +2043,8 @@ struct ieee80211_vif {
struct ieee80211_vif *mbssid_tx_vif;
ANDROID_KABI_RESERVE(1);
/* must be last */
u8 drv_priv[] __aligned(sizeof(void *));
};
@@ -2512,6 +2522,8 @@ struct ieee80211_sta {
struct ieee80211_link_sta deflink;
struct ieee80211_link_sta __rcu *link[IEEE80211_MLD_MAX_NUM_LINKS];
ANDROID_KABI_RESERVE(1);
/* must be last */
u8 drv_priv[] __aligned(sizeof(void *));
};
@@ -3053,6 +3065,8 @@ struct ieee80211_hw {
u32 max_mtu;
const s8 *tx_power_levels;
u8 max_txpwr_levels_idx;
ANDROID_KABI_RESERVE(1);
};
static inline bool _ieee80211_hw_check(struct ieee80211_hw *hw,
@@ -4828,6 +4842,11 @@ struct ieee80211_ops {
enum ieee80211_neg_ttlm_res
(*can_neg_ttlm)(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
struct ieee80211_neg_ttlm *ttlm);
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
ANDROID_KABI_RESERVE(3);
ANDROID_KABI_RESERVE(4);
};
/**
@@ -7003,6 +7022,11 @@ struct rate_control_ops {
struct dentry *dir);
u32 (*get_expected_throughput)(void *priv_sta);
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
ANDROID_KABI_RESERVE(3);
ANDROID_KABI_RESERVE(4);
};
static inline int rate_supported(struct ieee80211_sta *sta,
include/net/neighbour.h
+8
View File
@@ -28,6 +28,7 @@
#include <linux/err.h>
#include <linux/sysctl.h>
#include <linux/workqueue.h>
#include <linux/android_kabi.h>
#include <net/rtnetlink.h>
/*
@@ -86,6 +87,8 @@ struct neigh_parms {
u32 qlen;
int data[NEIGH_VAR_DATA_MAX];
DECLARE_BITMAP(data_state, NEIGH_VAR_DATA_MAX);
ANDROID_KABI_RESERVE(1);
};
static inline void neigh_var_set(struct neigh_parms *p, int index, int val)
@@ -162,6 +165,9 @@ struct neighbour {
struct rcu_head rcu;
struct net_device *dev;
netdevice_tracker dev_tracker;
ANDROID_KABI_RESERVE(1);
u8 primary_key[];
} __randomize_layout;
@@ -234,6 +240,8 @@ struct neigh_table {
struct neigh_statistics __percpu *stats;
struct neigh_hash_table __rcu *nht;
struct pneigh_entry **phash_buckets;
ANDROID_KABI_RESERVE(1);
};
enum {
include/net/netdev_rx_queue.h
+5
View File
@@ -7,6 +7,7 @@
#include <linux/sysfs.h>
#include <net/xdp.h>
#include <net/page_pool/types.h>
#include <linux/android_kabi.h>
/* This structure contains an instance of an RX queue. */
struct netdev_rx_queue {
@@ -27,6 +28,10 @@ struct netdev_rx_queue {
*/
struct napi_struct *napi;
struct pp_memory_provider_params mp_params;
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
ANDROID_KABI_RESERVE(3);
ANDROID_KABI_RESERVE(4);
} ____cacheline_aligned_in_smp;
/*
include/net/netfilter/nf_conntrack.h
+4
View File
@@ -15,6 +15,7 @@
#include <linux/bitops.h>
#include <linux/compiler.h>
#include <linux/android_kabi.h>
#include <linux/netfilter/nf_conntrack_common.h>
#include <linux/netfilter/nf_conntrack_tcp.h>
@@ -123,6 +124,9 @@ struct nf_conn {
/* Storage reserved for other modules, must be the last member */
union nf_conntrack_proto proto;
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
};
static inline struct nf_conn *
include/net/netns/can.h
+3
View File
@@ -8,6 +8,7 @@
#include <linux/spinlock.h>
#include <linux/timer.h>
#include <linux/android_kabi.h>
struct can_dev_rcv_lists;
struct can_pkg_stats;
@@ -36,6 +37,8 @@ struct netns_can {
/* CAN GW per-net gateway jobs */
struct hlist_head cgw_list;
ANDROID_KABI_RESERVE(1);
};
#endif /* __NETNS_CAN_H__ */
include/net/netns/ipv4.h
+3
View File
@@ -11,6 +11,7 @@
#include <linux/rcupdate.h>
#include <linux/seqlock.h>
#include <linux/siphash.h>
#include <linux/android_kabi.h>
struct ctl_table_header;
struct ipv4_devconf;
@@ -270,5 +271,7 @@ struct netns_ipv4 {
atomic_t rt_genid;
siphash_key_t ip_id_key;
ANDROID_KABI_RESERVE(1);
};
#endif
include/net/netns/ipv6.h
+5
View File
@@ -7,6 +7,7 @@
#ifndef __NETNS_IPV6_H__
#define __NETNS_IPV6_H__
#include <linux/android_kabi.h>
#include <net/dst_ops.h>
#include <uapi/linux/icmpv6.h>
@@ -56,6 +57,8 @@ struct netns_sysctl_ipv6 {
u8 skip_notify_on_dev_down;
u8 fib_notify_on_flag_change;
u8 icmpv6_error_anycast_as_unicast;
ANDROID_KABI_RESERVE(1);
};
struct netns_ipv6 {
@@ -119,6 +122,8 @@ struct netns_ipv6 {
u32 seq;
} ip6addrlbl_table;
struct ioam6_pernet_data *ioam6_data;
ANDROID_KABI_RESERVE(1);
};
#if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
include/net/netns/netfilter.h
+3
View File
@@ -3,6 +3,7 @@
#define __NETNS_NETFILTER_H
#include <linux/netfilter_defs.h>
#include <linux/android_kabi.h>
struct proc_dir_entry;
struct nf_logger;
@@ -33,5 +34,7 @@ struct netns_nf {
#if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
unsigned int defrag_ipv6_users;
#endif
ANDROID_KABI_RESERVE(1);
};
#endif
include/net/netns/nftables.h
+3
View File
@@ -2,8 +2,11 @@
#ifndef _NETNS_NFTABLES_H_
#define _NETNS_NFTABLES_H_
#include <linux/android_kabi.h>
struct netns_nftables {
u8 gencursor;
ANDROID_KABI_RESERVE(1);
};
#endif
include/net/netns/xfrm.h
+3
View File
@@ -7,6 +7,7 @@
#include <linux/workqueue.h>
#include <linux/rhashtable-types.h>
#include <linux/xfrm.h>
#include <linux/android_kabi.h>
#include <net/dst_ops.h>
struct ctl_table_header;
@@ -84,6 +85,8 @@ struct netns_xfrm {
spinlock_t xfrm_policy_lock;
struct mutex xfrm_cfg_mutex;
struct delayed_work nat_keepalive_work;
ANDROID_KABI_RESERVE(1);
};
#endif
include/net/page_pool/types.h
+2
View File
@@ -7,6 +7,7 @@
#include <linux/ptr_ring.h>
#include <linux/types.h>
#include <net/netmem.h>
#include <linux/android_kabi.h>
#define PP_FLAG_DMA_MAP BIT(0) /* Should page_pool do the DMA
* map/unmap
@@ -239,6 +240,7 @@ struct page_pool {
u32 napi_id;
u32 id;
} user;
ANDROID_KABI_RESERVE(1);
};
struct page *page_pool_alloc_pages(struct page_pool *pool, gfp_t gfp);
include/net/sch_generic.h
+8
View File
@@ -16,6 +16,7 @@
#include <linux/rwsem.h>
#include <linux/atomic.h>
#include <linux/hashtable.h>
#include <linux/android_kabi.h>
#include <net/gen_stats.h>
#include <net/rtnetlink.h>
#include <net/flow_offload.h>
@@ -129,6 +130,9 @@ struct Qdisc {
struct rcu_head rcu;
netdevice_tracker dev_tracker;
struct lock_class_key root_lock_key;
ANDROID_KABI_RESERVE(1);
/* private data */
long privdata[] ____cacheline_aligned;
};
@@ -275,6 +279,8 @@ struct Qdisc_class_ops {
struct sk_buff *skb, struct tcmsg*);
int (*dump_stats)(struct Qdisc *, unsigned long,
struct gnet_dump *);
ANDROID_KABI_RESERVE(1);
};
/* Qdisc_class_ops flag values */
@@ -320,6 +326,8 @@ struct Qdisc_ops {
u32 (*egress_block_get)(struct Qdisc *sch);
struct module *owner;
ANDROID_KABI_RESERVE(1);
};
struct tcf_result {
include/net/sock.h
+9
View File
@@ -70,6 +70,7 @@
#include <net/l3mdev.h>
#include <uapi/linux/socket.h>
#include <linux/android_vendor.h>
#include <linux/android_kabi.h>
/*
* This structure really needs to be cleaned up.
@@ -546,6 +547,14 @@ struct sock {
netns_tracker ns_tracker;
struct xarray sk_user_frags;
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
ANDROID_KABI_RESERVE(3);
ANDROID_KABI_RESERVE(4);
ANDROID_KABI_RESERVE(5);
ANDROID_KABI_RESERVE(6);
ANDROID_KABI_RESERVE(7);
ANDROID_KABI_RESERVE(8);
ANDROID_OEM_DATA(1);
};
include/net/tls.h
+11
View File
@@ -42,6 +42,7 @@
#include <linux/mutex.h>
#include <linux/netdevice.h>
#include <linux/rcupdate.h>
#include <linux/android_kabi.h>
#include <net/net_namespace.h>
#include <net/tcp.h>
@@ -102,6 +103,8 @@ struct tls_sw_context_tx {
#define BIT_TX_SCHEDULED 0
#define BIT_TX_CLOSING 1
unsigned long tx_bitmask;
ANDROID_KABI_RESERVE(1);
};
struct tls_strparser {
@@ -136,6 +139,8 @@ struct tls_sw_context_rx {
atomic_t decrypt_pending;
struct sk_buff_head async_hold;
struct wait_queue_head wq;
ANDROID_KABI_RESERVE(1);
};
struct tls_record_info {
@@ -277,6 +282,12 @@ struct tlsdev_ops {
int (*tls_dev_resync)(struct net_device *netdev,
struct sock *sk, u32 seq, u8 *rcd_sn,
enum tls_offload_ctx_dir direction);
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
ANDROID_KABI_RESERVE(3);
ANDROID_KABI_RESERVE(4);
};
enum tls_offload_sync_type {