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/linux/netfilter/ipset/ip_set.h
+7
View File
@@ -14,6 +14,7 @@
#include <linux/netfilter/x_tables.h>
#include <linux/stringify.h>
#include <linux/vmalloc.h>
#include <linux/android_kabi.h>
#include <net/netlink.h>
#include <uapi/linux/netfilter/ipset/ip_set.h>
@@ -190,6 +191,8 @@ struct ip_set_type_variant {
void (*cancel_gc)(struct ip_set *set);
/* Region-locking is used */
bool region_lock;
ANDROID_KABI_RESERVE(1);
};
struct ip_set_region {
@@ -236,6 +239,8 @@ struct ip_set_type {
/* Set this to THIS_MODULE if you are a module, otherwise NULL */
struct module *me;
ANDROID_KABI_RESERVE(1);
};
/* register and unregister set type */
@@ -280,6 +285,8 @@ struct ip_set {
size_t offset[IPSET_EXT_ID_MAX];
/* The type specific data */
void *data;
ANDROID_KABI_RESERVE(1);
};
static inline void
include/linux/netfilter/nfnetlink.h
+5
View File
@@ -4,6 +4,7 @@
#include <linux/netlink.h>
#include <linux/capability.h>
#include <linux/android_kabi.h>
#include <net/netlink.h>
#include <uapi/linux/netfilter/nfnetlink.h>
@@ -28,6 +29,8 @@ struct nfnl_callback {
const struct nla_policy *policy;
enum nfnl_callback_type type;
__u16 attr_count;
ANDROID_KABI_RESERVE(1);
};
enum nfnl_abort_action {
@@ -46,6 +49,8 @@ struct nfnetlink_subsystem {
int (*abort)(struct net *net, struct sk_buff *skb,
enum nfnl_abort_action action);
bool (*valid_genid)(struct net *net, u32 genid);
ANDROID_KABI_RESERVE(1);
};
int nfnetlink_subsys_register(const struct nfnetlink_subsystem *n);