Commit 9b66ee06 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller
Browse files

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: default avatarJakub Kicinski <kuba@kernel.org>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ca7d0500

net/core/netdev-genl-gen.c

+1 −1
Original line number Diff line number Diff line
@@ -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] = {

net/core/netdev-genl-gen.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

net/handshake/genl.c

+1 −1
Original line number Diff line number Diff line
@@ -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] = {

net/handshake/genl.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

net/ipv4/fou_nl.c

+1 −1
Original line number Diff line number Diff line
@@ -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] = {