Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-12-29 09:16:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

net: ynl: prefix uAPI header include with uapi/

Browse Source 
To keep things simple we used to include the uAPI header
in the kernel in the #include <linux/$family.h> format.
This works well enough, most of the genl families should
have headers in include/net/ so linux/$family.h ends up
referring to the uAPI header, anyway. And if it doesn't
no big deal, we'll just include more info than we need.

Unless that is there is a naming conflict. Someone recently
created include/linux/psp.h which will be a problem when
supporting the PSP protocol. (I'm talking about
work-in-progress patches, but it's just a proof that assuming
lack of name conflicts was overly optimistic.)

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jakub Kicinski 2023-05-24 10:09:01 -07:00 committed by David S. Miller
parent ca7d05007d
commit 9b66ee06e5
7 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/core/netdev-genl-gen.c
View File

@ -8,7 +8,7 @@
#include "netdev-genl-gen.h"
#include <linux/netdev.h>
#include <uapi/linux/netdev.h>
/* NETDEV_CMD_DEV_GET - do */
static const struct nla_policy netdev_dev_get_nl_policy[NETDEV_A_DEV_IFINDEX + 1] = {

2
net/core/netdev-genl-gen.h
View File

@ -9,7 +9,7 @@
#include <net/netlink.h>
#include <net/genetlink.h>
#include <linux/netdev.h>
#include <uapi/linux/netdev.h>
int netdev_nl_dev_get_doit(struct sk_buff *skb, struct genl_info *info);
int netdev_nl_dev_get_dumpit(struct sk_buff *skb, struct netlink_callback *cb);

2
net/handshake/genl.c
View File

@ -8,7 +8,7 @@
#include "genl.h"
#include <linux/handshake.h>
#include <uapi/linux/handshake.h>
/* HANDSHAKE_CMD_ACCEPT - do */
static const struct nla_policy handshake_accept_nl_policy[HANDSHAKE_A_ACCEPT_HANDLER_CLASS + 1] = {

2
net/handshake/genl.h
View File

@ -9,7 +9,7 @@
#include <net/netlink.h>
#include <net/genetlink.h>
#include <linux/handshake.h>
#include <uapi/linux/handshake.h>
int handshake_nl_accept_doit(struct sk_buff *skb, struct genl_info *info);
int handshake_nl_done_doit(struct sk_buff *skb, struct genl_info *info);

2
net/ipv4/fou_nl.c
View File

@ -8,7 +8,7 @@
#include "fou_nl.h"
#include <linux/fou.h>
#include <uapi/linux/fou.h>
/* Global operation policy for fou */
const struct nla_policy fou_nl_policy[FOU_ATTR_IFINDEX + 1] = {

2
net/ipv4/fou_nl.h
View File

@ -9,7 +9,7 @@
#include <net/netlink.h>
#include <net/genetlink.h>
#include <linux/fou.h>
#include <uapi/linux/fou.h>
/* Global operation policy for fou */
extern const struct nla_policy fou_nl_policy[FOU_ATTR_IFINDEX + 1];

4
tools/net/ynl/ynl-gen-c.py
View File

@ -2101,7 +2101,9 @@ def main():
if args.out_file:
cw.p(f'#include "{os.path.basename(args.out_file[:-2])}.h"')
cw.nl()
headers = [parsed.uapi_header]
headers = ['uapi/' + parsed.uapi_header]
else:
headers = [parsed.uapi_header]
for definition in parsed['definitions']:
if 'header' in definition:
headers.append(definition['header'])