mirror of
				https://git.proxmox.com/git/mirror_iproute2
				synced 2025-10-31 04:58:17 +00:00 
			
		
		
		
	 596b1c94aa
			
		
	
	
		596b1c94aa
		
	
	
	
	
		
			
			iproute2 contains a bunch of kernel headers, including uapi ones. Android's libc uses uapi headers almost directly, and uses a script to fix kernel types that don't match what userspace expects. For example: https://issuetracker.google.com/36987220 reports that our struct ip_mreq_source contains "__be32 imr_multiaddr" rather than "struct in_addr imr_multiaddr". The script addresses this by replacing the uapi struct definition with a #include <bits/ip_mreq.h> which contains the traditional userspace definition. Unfortunately, when we compile iproute2, this definition conflicts with the one in iproute2's linux/in.h. Historically we've just solved this problem by running "git rm" on all the iproute2 include/linux headers that break Android's libc. However, deleting the files in this way makes it harder to keep up with upstream, because every upstream change to an include file causes a merge conflict with the delete. This patch fixes the problem by moving the iproute2 linux headers from include/linux to include/uapi/linux. Tested: compiles on ubuntu trusty (glibc) Signed-off-by: Elliott Hughes <enh@google.com> Signed-off-by: Lorenzo Colitti <lorenzo@google.com>
		
			
				
	
	
		
			89 lines
		
	
	
		
			1.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			89 lines
		
	
	
		
			1.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| #ifndef __LINUX_GENERIC_NETLINK_H
 | |
| #define __LINUX_GENERIC_NETLINK_H
 | |
| 
 | |
| #include <linux/types.h>
 | |
| #include <linux/netlink.h>
 | |
| 
 | |
| #define GENL_NAMSIZ	16	/* length of family name */
 | |
| 
 | |
| #define GENL_MIN_ID	NLMSG_MIN_TYPE
 | |
| #define GENL_MAX_ID	1023
 | |
| 
 | |
| struct genlmsghdr {
 | |
| 	__u8	cmd;
 | |
| 	__u8	version;
 | |
| 	__u16	reserved;
 | |
| };
 | |
| 
 | |
| #define GENL_HDRLEN	NLMSG_ALIGN(sizeof(struct genlmsghdr))
 | |
| 
 | |
| #define GENL_ADMIN_PERM		0x01
 | |
| #define GENL_CMD_CAP_DO		0x02
 | |
| #define GENL_CMD_CAP_DUMP	0x04
 | |
| #define GENL_CMD_CAP_HASPOL	0x08
 | |
| #define GENL_UNS_ADMIN_PERM	0x10
 | |
| 
 | |
| /*
 | |
|  * List of reserved static generic netlink identifiers:
 | |
|  */
 | |
| #define GENL_ID_CTRL		NLMSG_MIN_TYPE
 | |
| #define GENL_ID_VFS_DQUOT	(NLMSG_MIN_TYPE + 1)
 | |
| #define GENL_ID_PMCRAID		(NLMSG_MIN_TYPE + 2)
 | |
| /* must be last reserved + 1 */
 | |
| #define GENL_START_ALLOC	(NLMSG_MIN_TYPE + 3)
 | |
| 
 | |
| /**************************************************************************
 | |
|  * Controller
 | |
|  **************************************************************************/
 | |
| 
 | |
| enum {
 | |
| 	CTRL_CMD_UNSPEC,
 | |
| 	CTRL_CMD_NEWFAMILY,
 | |
| 	CTRL_CMD_DELFAMILY,
 | |
| 	CTRL_CMD_GETFAMILY,
 | |
| 	CTRL_CMD_NEWOPS,
 | |
| 	CTRL_CMD_DELOPS,
 | |
| 	CTRL_CMD_GETOPS,
 | |
| 	CTRL_CMD_NEWMCAST_GRP,
 | |
| 	CTRL_CMD_DELMCAST_GRP,
 | |
| 	CTRL_CMD_GETMCAST_GRP, /* unused */
 | |
| 	__CTRL_CMD_MAX,
 | |
| };
 | |
| 
 | |
| #define CTRL_CMD_MAX (__CTRL_CMD_MAX - 1)
 | |
| 
 | |
| enum {
 | |
| 	CTRL_ATTR_UNSPEC,
 | |
| 	CTRL_ATTR_FAMILY_ID,
 | |
| 	CTRL_ATTR_FAMILY_NAME,
 | |
| 	CTRL_ATTR_VERSION,
 | |
| 	CTRL_ATTR_HDRSIZE,
 | |
| 	CTRL_ATTR_MAXATTR,
 | |
| 	CTRL_ATTR_OPS,
 | |
| 	CTRL_ATTR_MCAST_GROUPS,
 | |
| 	__CTRL_ATTR_MAX,
 | |
| };
 | |
| 
 | |
| #define CTRL_ATTR_MAX (__CTRL_ATTR_MAX - 1)
 | |
| 
 | |
| enum {
 | |
| 	CTRL_ATTR_OP_UNSPEC,
 | |
| 	CTRL_ATTR_OP_ID,
 | |
| 	CTRL_ATTR_OP_FLAGS,
 | |
| 	__CTRL_ATTR_OP_MAX,
 | |
| };
 | |
| 
 | |
| #define CTRL_ATTR_OP_MAX (__CTRL_ATTR_OP_MAX - 1)
 | |
| 
 | |
| enum {
 | |
| 	CTRL_ATTR_MCAST_GRP_UNSPEC,
 | |
| 	CTRL_ATTR_MCAST_GRP_NAME,
 | |
| 	CTRL_ATTR_MCAST_GRP_ID,
 | |
| 	__CTRL_ATTR_MCAST_GRP_MAX,
 | |
| };
 | |
| 
 | |
| #define CTRL_ATTR_MCAST_GRP_MAX (__CTRL_ATTR_MCAST_GRP_MAX - 1)
 | |
| 
 | |
| 
 | |
| #endif /* __LINUX_GENERIC_NETLINK_H */
 |