diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-05-24 20:09:01 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-05-26 12:30:14 +0300 |
| commit | 9b66ee06e5ca2698d0ba12a7ad7188cb724279e7 (patch) | |
| tree | 5154ba9312f0738b8b742fb800604913af2cf740 /net/handshake | |
| parent | ca7d05007d0a95615a51cb5a624775db8c450f43 (diff) | |
| download | linux-9b66ee06e5ca2698d0ba12a7ad7188cb724279e7.tar.xz | |
net: ynl: prefix uAPI header include with uapi/
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>
Diffstat (limited to 'net/handshake')
| -rw-r--r-- | net/handshake/genl.c | 2 | ||||
| -rw-r--r-- | net/handshake/genl.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/handshake/genl.c b/net/handshake/genl.c index 9f29efb1493e..233be5cbfec9 100644 --- a/net/handshake/genl.c +++ b/net/handshake/genl.c @@ -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] = { diff --git a/net/handshake/genl.h b/net/handshake/genl.h index 2c1f1aa6a02a..ae72a596f6cc 100644 --- a/net/handshake/genl.h +++ b/net/handshake/genl.h @@ -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); |