diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-02-01 14:33:26 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-02-01 15:12:37 -0800 |
| commit | cf244463a286ea57ea7e63c33614d302f776e62e (patch) | |
| tree | caa068596cbfea621376822e30ab545c6516b2c7 /include/net/netfilter/nf_tables.h | |
| parent | cacfd6bfc381ce0e71dfb4ab902ca0fb0e1abe0f (diff) | |
| parent | 41b9fb381a486360b2daaec0c7480f8e3ff72bc7 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
No conflicts or adjacent changes.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include/net/netfilter/nf_tables.h')
| -rw-r--r-- | include/net/netfilter/nf_tables.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/netfilter/nf_tables.h b/include/net/netfilter/nf_tables.h index ac7c94d3648e..f3a7c4b1dd63 100644 --- a/include/net/netfilter/nf_tables.h +++ b/include/net/netfilter/nf_tables.h @@ -1357,6 +1357,7 @@ void nft_obj_notify(struct net *net, const struct nft_table *table, * @type: stateful object numeric type * @owner: module owner * @maxattr: maximum netlink attribute + * @family: address family for AF-specific object types * @policy: netlink attribute policy */ struct nft_object_type { @@ -1366,6 +1367,7 @@ struct nft_object_type { struct list_head list; u32 type; unsigned int maxattr; + u8 family; struct module *owner; const struct nla_policy *policy; }; |