Commit 8066e388 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

net: add UAPI to the header guard in various network headers 



fib_rule, ip6_tunnel, and a whole lot of if_* headers lack the customary
_UAPI in the header guard. Without it YNL build can't protect from in tree
and system headers both getting included. YNL doesn't need most of these
but it's annoying to have to fix them one by one.

Note that header installation strips this _UAPI prefix so this should
result in no change to the end user.

Acked-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Reviewed-by: default avatarJason Xing <kerneljasonxing@gmail.com>
Reviewed-by: default avatarIdo Schimmel <idosch@nvidia.com>
Link: https://patch.msgid.link/20250416200840.1338195-1-kuba@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 1df4a945

include/uapi/linux/fib_rules.h

+2 −2
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

#ifndef __LINUX_FIB_RULES_H

#define __LINUX_FIB_RULES_H

#ifndef _UAPI__LINUX_FIB_RULES_H

#define _UAPI__LINUX_FIB_RULES_H



#include <linux/types.h>

#include <linux/rtnetlink.h>

include/uapi/linux/if_addr.h

+2 −2
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

#ifndef __LINUX_IF_ADDR_H

#define __LINUX_IF_ADDR_H

#ifndef _UAPI__LINUX_IF_ADDR_H

#define _UAPI__LINUX_IF_ADDR_H



#include <linux/types.h>

#include <linux/netlink.h>

include/uapi/linux/if_addrlabel.h

+2 −2
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ 
 *	YOSHIFUJI Hideaki @ USAGI/WIDE <yoshfuji@linux-ipv6.org>

 */



#ifndef __LINUX_IF_ADDRLABEL_H

#define __LINUX_IF_ADDRLABEL_H

#ifndef _UAPI__LINUX_IF_ADDRLABEL_H

#define _UAPI__LINUX_IF_ADDRLABEL_H



#include <linux/types.h>

include/uapi/linux/if_alg.h

+3 −3
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ 
 *

 */



#ifndef _LINUX_IF_ALG_H

#define _LINUX_IF_ALG_H

#ifndef _UAPI_LINUX_IF_ALG_H

#define _UAPI_LINUX_IF_ALG_H



#include <linux/types.h>
@@ -58,4 +58,4 @@ struct af_alg_iv { 
#define ALG_OP_DECRYPT			0

#define ALG_OP_ENCRYPT			1



#endif	/* _LINUX_IF_ALG_H */
 
#endif	/* _UAPI_LINUX_IF_ALG_H */

include/uapi/linux/if_arcnet.h

+3 −3
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
 *              2 of the License, or (at your option) any later version.

 */



#ifndef _LINUX_IF_ARCNET_H

#define _LINUX_IF_ARCNET_H

#ifndef _UAPI_LINUX_IF_ARCNET_H

#define _UAPI_LINUX_IF_ARCNET_H



#include <linux/types.h>

#include <linux/if_ether.h>
@@ -127,4 +127,4 @@ struct archdr { 
	} soft;

};



#endif				/* _LINUX_IF_ARCNET_H */
 
#endif				/* _UAPI_LINUX_IF_ARCNET_H */