diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fib_rules.h | 20 | ||||
| -rw-r--r-- | include/linux/if_addr.h | 3 | ||||
| -rw-r--r-- | include/linux/if_bridge.h | 10 | ||||
| -rw-r--r-- | include/linux/if_link.h | 92 | ||||
| -rw-r--r-- | include/linux/lwtunnel.h | 7 | ||||
| -rw-r--r-- | include/linux/mpls_iptunnel.h | 7 | ||||
| -rw-r--r-- | include/linux/neighbour.h | 3 | ||||
| -rw-r--r-- | include/linux/net_namespace.h | 7 | ||||
| -rw-r--r-- | include/linux/netlink.h | 11 | ||||
| -rw-r--r-- | include/linux/rtnetlink.h | 49 | ||||
| -rw-r--r-- | include/linux/socket.h | 7 | 
11 files changed, 189 insertions, 27 deletions
diff --git a/include/linux/fib_rules.h b/include/linux/fib_rules.h index bc6688012c..232df14e12 100644 --- a/include/linux/fib_rules.h +++ b/include/linux/fib_rules.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */  #ifndef __LINUX_FIB_RULES_H  #define __LINUX_FIB_RULES_H @@ -22,13 +23,23 @@ struct fib_rule_hdr {  	__u8		tos;  	__u8		table; -	__u8		res1;	/* reserved */ +	__u8		res1;   /* reserved */  	__u8		res2;	/* reserved */  	__u8		action;  	__u32		flags;  }; +struct fib_rule_uid_range { +	__u32		start; +	__u32		end; +}; + +struct fib_rule_port_range { +	__u16		start; +	__u16		end; +}; +  enum {  	FRA_UNSPEC,  	FRA_DST,	/* destination address */ @@ -43,7 +54,7 @@ enum {  	FRA_UNUSED5,  	FRA_FWMARK,	/* mark */  	FRA_FLOW,	/* flow/class id */ -	FRA_UNUSED6, +	FRA_TUN_ID,  	FRA_SUPPRESS_IFGROUP,  	FRA_SUPPRESS_PREFIXLEN,  	FRA_TABLE,	/* Extended table id */ @@ -51,6 +62,11 @@ enum {  	FRA_OIFNAME,  	FRA_PAD,  	FRA_L3MDEV,	/* iif or oif is l3mdev goto its table */ +	FRA_UID_RANGE,	/* UID range */ +	FRA_PROTOCOL,   /* Originator of the rule */ +	FRA_IP_PROTO,	/* ip proto */ +	FRA_SPORT_RANGE, /* sport */ +	FRA_DPORT_RANGE, /* dport */  	__FRA_MAX  }; diff --git a/include/linux/if_addr.h b/include/linux/if_addr.h index a924606f36..dfcf3ce009 100644 --- a/include/linux/if_addr.h +++ b/include/linux/if_addr.h @@ -34,6 +34,7 @@ enum {  	IFA_MULTICAST,  	IFA_FLAGS,  	IFA_RT_PRIORITY,  /* u32, priority/metric for prefix route */ +	IFA_TARGET_NETNSID,  	__IFA_MAX,  }; @@ -63,7 +64,9 @@ struct ifa_cacheinfo {  };  /* backwards compatibility for userspace */ +#ifndef __KERNEL__  #define IFA_RTA(r)  ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifaddrmsg))))  #define IFA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifaddrmsg)) +#endif  #endif diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h index 156f4434ca..fb79481cb2 100644 --- a/include/linux/if_bridge.h +++ b/include/linux/if_bridge.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */  /*   *	Linux ethernet bridge   * @@ -10,8 +11,8 @@   *	2 of the License, or (at your option) any later version.   */ -#ifndef _LINUX_IF_BRIDGE_H -#define _LINUX_IF_BRIDGE_H +#ifndef _UAPI_LINUX_IF_BRIDGE_H +#define _UAPI_LINUX_IF_BRIDGE_H  #include <linux/types.h>  #include <linux/if_ether.h> @@ -96,7 +97,7 @@ struct __fdb_entry {  	__u32 ageing_timer_value;  	__u8 port_hi;  	__u8 pad0; -	__u16 unused; +	__u16 vlan;  };  /* Bridge Flags */ @@ -236,6 +237,7 @@ struct br_mdb_entry {  #define MDB_PERMANENT 1  	__u8 state;  #define MDB_FLAGS_OFFLOAD	(1 << 0) +#define MDB_FLAGS_FAST_LEAVE	(1 << 1)  	__u8 flags;  	__u16 vid;  	struct { @@ -291,4 +293,4 @@ struct br_mcast_stats {  	__u64 mcast_bytes[BR_MCAST_DIR_SIZE];  	__u64 mcast_packets[BR_MCAST_DIR_SIZE];  }; -#endif /* _LINUX_IF_BRIDGE_H */ +#endif /* _UAPI_LINUX_IF_BRIDGE_H */ diff --git a/include/linux/if_link.h b/include/linux/if_link.h index 1f97d0560b..22a45914a2 100644 --- a/include/linux/if_link.h +++ b/include/linux/if_link.h @@ -1,5 +1,6 @@ -#ifndef _LINUX_IF_LINK_H -#define _LINUX_IF_LINK_H +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +#ifndef _UAPI_LINUX_IF_LINK_H +#define _UAPI_LINUX_IF_LINK_H  #include <linux/types.h>  #include <linux/netlink.h> @@ -158,6 +159,14 @@ enum {  	IFLA_PAD,  	IFLA_XDP,  	IFLA_EVENT, +	IFLA_NEW_NETNSID, +	IFLA_IF_NETNSID, +	IFLA_TARGET_NETNSID = IFLA_IF_NETNSID, /* new alias */ +	IFLA_CARRIER_UP_COUNT, +	IFLA_CARRIER_DOWN_COUNT, +	IFLA_NEW_IFINDEX, +	IFLA_MIN_MTU, +	IFLA_MAX_MTU,  	__IFLA_MAX  }; @@ -165,8 +174,10 @@ enum {  #define IFLA_MAX (__IFLA_MAX - 1)  /* backwards compatibility for userspace */ +#ifndef __KERNEL__  #define IFLA_RTA(r)  ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifinfomsg))))  #define IFLA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifinfomsg)) +#endif  enum {  	IFLA_INET_UNSPEC, @@ -276,6 +287,7 @@ enum {  	IFLA_BR_MCAST_STATS_ENABLED,  	IFLA_BR_MCAST_IGMP_VERSION,  	IFLA_BR_MCAST_MLD_VERSION, +	IFLA_BR_VLAN_STATS_PER_PORT,  	__IFLA_BR_MAX,  }; @@ -323,6 +335,14 @@ enum {  	IFLA_BRPORT_MCAST_TO_UCAST,  	IFLA_BRPORT_VLAN_TUNNEL,  	IFLA_BRPORT_BCAST_FLOOD, +	IFLA_BRPORT_GROUP_FWD_MASK, +	IFLA_BRPORT_NEIGH_SUPPRESS, +	IFLA_BRPORT_ISOLATED, +	IFLA_BRPORT_BACKUP_PORT, +	IFLA_BRPORT_PEER_LINK = 60, /* MLAG peer link */ +	IFLA_BRPORT_DUAL_LINK,  /* MLAG Dual Connected link */ +	IFLA_BRPORT_GROUP_FWD_MASKHI, +	IFLA_BRPORT_DUAL_LINK_READY,  	__IFLA_BRPORT_MAX  };  #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1) @@ -448,6 +468,16 @@ enum {  #define IFLA_MACSEC_MAX (__IFLA_MACSEC_MAX - 1) +/* XFRM section */ +enum { +	IFLA_XFRM_UNSPEC, +	IFLA_XFRM_LINK, +	IFLA_XFRM_IF_ID, +	__IFLA_XFRM_MAX +}; + +#define IFLA_XFRM_MAX (__IFLA_XFRM_MAX - 1) +  enum macsec_validation_type {  	MACSEC_VALIDATE_DISABLED = 0,  	MACSEC_VALIDATE_CHECK = 1, @@ -460,6 +490,7 @@ enum macsec_validation_type {  enum {  	IFLA_IPVLAN_UNSPEC,  	IFLA_IPVLAN_MODE, +	IFLA_IPVLAN_FLAGS,  	__IFLA_IPVLAN_MAX  }; @@ -472,6 +503,9 @@ enum ipvlan_mode {  	IPVLAN_MODE_MAX  }; +#define IPVLAN_F_PRIVATE	0x01 +#define IPVLAN_F_VEPA		0x02 +  /* VXLAN section */  enum {  	IFLA_VXLAN_UNSPEC, @@ -502,6 +536,7 @@ enum {  	IFLA_VXLAN_COLLECT_METADATA,  	IFLA_VXLAN_LABEL,  	IFLA_VXLAN_GPE, +	IFLA_VXLAN_TTL_INHERIT,  	__IFLA_VXLAN_MAX  };  #define IFLA_VXLAN_MAX	(__IFLA_VXLAN_MAX - 1) @@ -585,6 +620,8 @@ enum {  	IFLA_BOND_AD_USER_PORT_KEY,  	IFLA_BOND_AD_ACTOR_SYSTEM,  	IFLA_BOND_TLB_DYNAMIC_LB, +	IFLA_BOND_CL_START = 60, +	IFLA_BOND_AD_LACP_BYPASS = IFLA_BOND_CL_START,  	__IFLA_BOND_MAX,  }; @@ -612,6 +649,9 @@ enum {  	IFLA_BOND_SLAVE_AD_AGGREGATOR_ID,  	IFLA_BOND_SLAVE_AD_ACTOR_OPER_PORT_STATE,  	IFLA_BOND_SLAVE_AD_PARTNER_OPER_PORT_STATE, + +	IFLA_BOND_SLAVE_CL_START = 50, +	IFLA_BOND_SLAVE_AD_RX_BYPASS = IFLA_BOND_SLAVE_CL_START,  	__IFLA_BOND_SLAVE_MAX,  }; @@ -721,6 +761,8 @@ enum {  	IFLA_VF_STATS_BROADCAST,  	IFLA_VF_STATS_MULTICAST,  	IFLA_VF_STATS_PAD, +	IFLA_VF_STATS_RX_DROPPED, +	IFLA_VF_STATS_TX_DROPPED,  	__IFLA_VF_STATS_MAX,  }; @@ -872,6 +914,7 @@ enum {  enum {  	LINK_XSTATS_TYPE_UNSPEC,  	LINK_XSTATS_TYPE_BRIDGE, +	LINK_XSTATS_TYPE_BOND,  	__LINK_XSTATS_TYPE_MAX  };  #define LINK_XSTATS_TYPE_MAX (__LINK_XSTATS_TYPE_MAX - 1) @@ -902,6 +945,7 @@ enum {  	XDP_ATTACHED_DRV,  	XDP_ATTACHED_SKB,  	XDP_ATTACHED_HW, +	XDP_ATTACHED_MULTI,  };  enum { @@ -910,6 +954,9 @@ enum {  	IFLA_XDP_ATTACHED,  	IFLA_XDP_FLAGS,  	IFLA_XDP_PROG_ID, +	IFLA_XDP_DRV_PROG_ID, +	IFLA_XDP_SKB_PROG_ID, +	IFLA_XDP_HW_PROG_ID,  	__IFLA_XDP_MAX,  }; @@ -925,4 +972,43 @@ enum {  	IFLA_EVENT_BONDING_OPTIONS,	/* change in bonding options */  }; -#endif /* _LINUX_IF_LINK_H */ +/* tun section */ + +enum { +	IFLA_TUN_UNSPEC, +	IFLA_TUN_OWNER, +	IFLA_TUN_GROUP, +	IFLA_TUN_TYPE, +	IFLA_TUN_PI, +	IFLA_TUN_VNET_HDR, +	IFLA_TUN_PERSIST, +	IFLA_TUN_MULTI_QUEUE, +	IFLA_TUN_NUM_QUEUES, +	IFLA_TUN_NUM_DISABLED_QUEUES, +	__IFLA_TUN_MAX, +}; + +#define IFLA_TUN_MAX (__IFLA_TUN_MAX - 1) + +/* rmnet section */ + +#define RMNET_FLAGS_INGRESS_DEAGGREGATION         (1U << 0) +#define RMNET_FLAGS_INGRESS_MAP_COMMANDS          (1U << 1) +#define RMNET_FLAGS_INGRESS_MAP_CKSUMV4           (1U << 2) +#define RMNET_FLAGS_EGRESS_MAP_CKSUMV4            (1U << 3) + +enum { +	IFLA_RMNET_UNSPEC, +	IFLA_RMNET_MUX_ID, +	IFLA_RMNET_FLAGS, +	__IFLA_RMNET_MAX, +}; + +#define IFLA_RMNET_MAX	(__IFLA_RMNET_MAX - 1) + +struct ifla_rmnet_flags { +	__u32	flags; +	__u32	mask; +}; + +#endif /* _UAPI_LINUX_IF_LINK_H */ diff --git a/include/linux/lwtunnel.h b/include/linux/lwtunnel.h index 3298426271..de696ca12f 100644 --- a/include/linux/lwtunnel.h +++ b/include/linux/lwtunnel.h @@ -1,5 +1,6 @@ -#ifndef _LWTUNNEL_H_ -#define _LWTUNNEL_H_ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +#ifndef _UAPI_LWTUNNEL_H_ +#define _UAPI_LWTUNNEL_H_  #include <linux/types.h> @@ -67,4 +68,4 @@ enum {  #define LWT_BPF_MAX_HEADROOM 256 -#endif /* _LWTUNNEL_H_ */ +#endif /* _UAPI_LWTUNNEL_H_ */ diff --git a/include/linux/mpls_iptunnel.h b/include/linux/mpls_iptunnel.h index 1a0e57b45a..521f2e605f 100644 --- a/include/linux/mpls_iptunnel.h +++ b/include/linux/mpls_iptunnel.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */  /*   *	mpls tunnel api   * @@ -10,8 +11,8 @@   *	2 of the License, or (at your option) any later version.   */ -#ifndef _LINUX_MPLS_IPTUNNEL_H -#define _LINUX_MPLS_IPTUNNEL_H +#ifndef _UAPI_LINUX_MPLS_IPTUNNEL_H +#define _UAPI_LINUX_MPLS_IPTUNNEL_H  /* MPLS tunnel attributes   * [RTA_ENCAP] = { @@ -27,4 +28,4 @@ enum {  };  #define MPLS_IPTUNNEL_MAX (__MPLS_IPTUNNEL_MAX - 1) -#endif /* _LINUX_MPLS_IPTUNNEL_H */ +#endif /* _UAPI_LINUX_MPLS_IPTUNNEL_H */ diff --git a/include/linux/neighbour.h b/include/linux/neighbour.h index 3199d28980..cd144e3099 100644 --- a/include/linux/neighbour.h +++ b/include/linux/neighbour.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */  #ifndef __LINUX_NEIGHBOUR_H  #define __LINUX_NEIGHBOUR_H @@ -27,6 +28,7 @@ enum {  	NDA_MASTER,  	NDA_LINK_NETNSID,  	NDA_SRC_VNI, +	NDA_PROTOCOL,  /* Originator of entry */  	__NDA_MAX  }; @@ -42,6 +44,7 @@ enum {  #define NTF_PROXY	0x08	/* == ATF_PUBL */  #define NTF_EXT_LEARNED	0x10  #define NTF_OFFLOADED   0x20 +#define NTF_STICKY	0x40  #define NTF_ROUTER	0x80  /* diff --git a/include/linux/net_namespace.h b/include/linux/net_namespace.h index 9a92b7e14a..0187c74d88 100644 --- a/include/linux/net_namespace.h +++ b/include/linux/net_namespace.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */  /* Copyright (c) 2015 6WIND S.A.   * Author: Nicolas Dichtel <nicolas.dichtel@6wind.com>   * @@ -5,8 +6,8 @@   * under the terms and conditions of the GNU General Public License,   * version 2, as published by the Free Software Foundation.   */ -#ifndef _LINUX_NET_NAMESPACE_H_ -#define _LINUX_NET_NAMESPACE_H_ +#ifndef _UAPI_LINUX_NET_NAMESPACE_H_ +#define _UAPI_LINUX_NET_NAMESPACE_H_  /* Attributes of RTM_NEWNSID/RTM_GETNSID messages */  enum { @@ -20,4 +21,4 @@ enum {  #define NETNSA_MAX		(__NETNSA_MAX - 1) -#endif /* _LINUX_NET_NAMESPACE_H_ */ +#endif /* _UAPI_LINUX_NET_NAMESPACE_H_ */ diff --git a/include/linux/netlink.h b/include/linux/netlink.h index 0b2c29bd08..0a4d733177 100644 --- a/include/linux/netlink.h +++ b/include/linux/netlink.h @@ -1,6 +1,6 @@  /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -#ifndef __LINUX_NETLINK_H -#define __LINUX_NETLINK_H +#ifndef _UAPI__LINUX_NETLINK_H +#define _UAPI__LINUX_NETLINK_H  #include <linux/kernel.h>  #include <linux/socket.h> /* for __kernel_sa_family_t */ @@ -147,12 +147,15 @@ enum nlmsgerr_attrs {  #define NETLINK_PKTINFO			3  #define NETLINK_BROADCAST_ERROR		4  #define NETLINK_NO_ENOBUFS		5 +#ifndef __KERNEL__  #define NETLINK_RX_RING			6  #define NETLINK_TX_RING			7 +#endif  #define NETLINK_LISTEN_ALL_NSID		8  #define NETLINK_LIST_MEMBERSHIPS	9  #define NETLINK_CAP_ACK			10  #define NETLINK_EXT_ACK			11 +#define NETLINK_GET_STRICT_CHK		12  struct nl_pktinfo {  	__u32	group; @@ -175,6 +178,7 @@ struct nl_mmap_hdr {  	__u32		nm_gid;  }; +#ifndef __KERNEL__  enum nl_mmap_status {  	NL_MMAP_STATUS_UNUSED,  	NL_MMAP_STATUS_RESERVED, @@ -186,6 +190,7 @@ enum nl_mmap_status {  #define NL_MMAP_MSG_ALIGNMENT		NLMSG_ALIGNTO  #define NL_MMAP_MSG_ALIGN(sz)		__ALIGN_KERNEL(sz, NL_MMAP_MSG_ALIGNMENT)  #define NL_MMAP_HDRLEN			NL_MMAP_MSG_ALIGN(sizeof(struct nl_mmap_hdr)) +#endif  #define NET_MAJOR 36		/* Major 36 is reserved for networking 						*/ @@ -244,4 +249,4 @@ struct nla_bitfield32 {  	__u32 selector;  }; -#endif /* __LINUX_NETLINK_H */ +#endif /* _UAPI__LINUX_NETLINK_H */ diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h index 813e9e0767..ce2a623abb 100644 --- a/include/linux/rtnetlink.h +++ b/include/linux/rtnetlink.h @@ -1,5 +1,6 @@ -#ifndef __LINUX_RTNETLINK_H -#define __LINUX_RTNETLINK_H +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +#ifndef _UAPI__LINUX_RTNETLINK_H +#define _UAPI__LINUX_RTNETLINK_H  #include <linux/types.h>  #include <linux/netlink.h> @@ -149,6 +150,20 @@ enum {  	RTM_NEWCACHEREPORT = 96,  #define RTM_NEWCACHEREPORT RTM_NEWCACHEREPORT +	RTM_NEWCHAIN = 100, +#define RTM_NEWCHAIN RTM_NEWCHAIN +	RTM_DELCHAIN, +#define RTM_DELCHAIN RTM_DELCHAIN +	RTM_GETCHAIN, +#define RTM_GETCHAIN RTM_GETCHAIN + +	RTM_NEWNEXTHOP = 104, +#define RTM_NEWNEXTHOP	RTM_NEWNEXTHOP +	RTM_DELNEXTHOP, +#define RTM_DELNEXTHOP	RTM_DELNEXTHOP +	RTM_GETNEXTHOP, +#define RTM_GETNEXTHOP	RTM_GETNEXTHOP +  	__RTM_MAX,  #define RTM_MAX		(((__RTM_MAX + 3) & ~3) - 1)  }; @@ -253,6 +268,11 @@ enum {  #define RTPROT_DHCP	16      /* DHCP client */  #define RTPROT_MROUTED	17      /* Multicast daemon */  #define RTPROT_BABEL	42      /* Babel daemon */ +#define RTPROT_BGP	186     /* BGP Routes */ +#define RTPROT_ISIS	187     /* ISIS Routes */ +#define RTPROT_OSPF	188     /* OSPF Routes */ +#define RTPROT_RIP	189     /* RIP Routes */ +#define RTPROT_EIGRP	192     /* EIGRP Routes */  /* rtm_scope @@ -326,6 +346,10 @@ enum rtattr_type_t {  	RTA_PAD,  	RTA_UID,  	RTA_TTL_PROPAGATE, +	RTA_IP_PROTO, +	RTA_SPORT, +	RTA_DPORT, +	RTA_NH_ID,  	__RTA_MAX  }; @@ -430,6 +454,8 @@ enum {  #define RTAX_QUICKACK RTAX_QUICKACK  	RTAX_CC_ALGO,  #define RTAX_CC_ALGO RTAX_CC_ALGO +	RTAX_FASTOPEN_NO_COOKIE, +#define RTAX_FASTOPEN_NO_COOKIE RTAX_FASTOPEN_NO_COOKIE  	__RTAX_MAX  }; @@ -538,9 +564,19 @@ struct tcmsg {  	int		tcm_ifindex;  	__u32		tcm_handle;  	__u32		tcm_parent; +/* tcm_block_index is used instead of tcm_parent + * in case tcm_ifindex == TCM_IFINDEX_MAGIC_BLOCK + */ +#define tcm_block_index tcm_parent  	__u32		tcm_info;  }; +/* For manipulation of filters in shared block, tcm_ifindex is set to + * TCM_IFINDEX_MAGIC_BLOCK, and tcm_parent is aliased to tcm_block_index + * which is the block index. + */ +#define TCM_IFINDEX_MAGIC_BLOCK (0xFFFFFFFFU) +  enum {  	TCA_UNSPEC,  	TCA_KIND, @@ -554,6 +590,9 @@ enum {  	TCA_PAD,  	TCA_DUMP_INVISIBLE,  	TCA_CHAIN, +	TCA_HW_OFFLOAD, +	TCA_INGRESS_BLOCK, +	TCA_EGRESS_BLOCK,  	__TCA_MAX  }; @@ -586,6 +625,7 @@ enum {  #define NDUSEROPT_MAX	(__NDUSEROPT_MAX - 1) +#ifndef __KERNEL__  /* RTnetlink multicast groups - backwards compatibility for userspace */  #define RTMGRP_LINK		1  #define RTMGRP_NOTIFY		2 @@ -606,6 +646,7 @@ enum {  #define RTMGRP_DECnet_ROUTE     0x4000  #define RTMGRP_IPV6_PREFIX	0x20000 +#endif  /* RTnetlink multicast groups */  enum rtnetlink_groups { @@ -671,6 +712,8 @@ enum rtnetlink_groups {  #define RTNLGRP_IPV4_MROUTE_R	RTNLGRP_IPV4_MROUTE_R  	RTNLGRP_IPV6_MROUTE_R,  #define RTNLGRP_IPV6_MROUTE_R	RTNLGRP_IPV6_MROUTE_R +	RTNLGRP_NEXTHOP, +#define RTNLGRP_NEXTHOP		RTNLGRP_NEXTHOP  	__RTNLGRP_MAX  };  #define RTNLGRP_MAX	(__RTNLGRP_MAX - 1) @@ -715,4 +758,4 @@ enum { -#endif /* __LINUX_RTNETLINK_H */ +#endif /* _UAPI__LINUX_RTNETLINK_H */ diff --git a/include/linux/socket.h b/include/linux/socket.h index 8c1e501774..8eb9602170 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h @@ -1,5 +1,6 @@ -#ifndef _LINUX_SOCKET_H -#define _LINUX_SOCKET_H +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +#ifndef _UAPI_LINUX_SOCKET_H +#define _UAPI_LINUX_SOCKET_H  /*   * Desired design of maximum size and alignment (see RFC2553) @@ -18,4 +19,4 @@ struct __kernel_sockaddr_storage {  				/* _SS_MAXSIZE value minus size of ss_family */  } __attribute__ ((aligned(_K_SS_ALIGNSIZE)));	/* force desired alignment */ -#endif /* _LINUX_SOCKET_H */ +#endif /* _UAPI_LINUX_SOCKET_H */  | 
