mirror of
				https://git.proxmox.com/git/mirror_iproute2
				synced 2025-10-31 02:59:53 +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>
		
			
				
	
	
		
			69 lines
		
	
	
		
			1.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			69 lines
		
	
	
		
			1.8 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  *  SR-IPv6 implementation
 | |
|  *
 | |
|  *  Author:
 | |
|  *  David Lebrun <david.lebrun@uclouvain.be>
 | |
|  *
 | |
|  *
 | |
|  *  This program is free software; you can redistribute it and/or
 | |
|  *      modify it under the terms of the GNU General Public License
 | |
|  *      as published by the Free Software Foundation; either version
 | |
|  *      2 of the License, or (at your option) any later version.
 | |
|  */
 | |
| 
 | |
| #ifndef _LINUX_SEG6_LOCAL_H
 | |
| #define _LINUX_SEG6_LOCAL_H
 | |
| 
 | |
| #include <linux/seg6.h>
 | |
| 
 | |
| enum {
 | |
| 	SEG6_LOCAL_UNSPEC,
 | |
| 	SEG6_LOCAL_ACTION,
 | |
| 	SEG6_LOCAL_SRH,
 | |
| 	SEG6_LOCAL_TABLE,
 | |
| 	SEG6_LOCAL_NH4,
 | |
| 	SEG6_LOCAL_NH6,
 | |
| 	SEG6_LOCAL_IIF,
 | |
| 	SEG6_LOCAL_OIF,
 | |
| 	__SEG6_LOCAL_MAX,
 | |
| };
 | |
| #define SEG6_LOCAL_MAX (__SEG6_LOCAL_MAX - 1)
 | |
| 
 | |
| enum {
 | |
| 	SEG6_LOCAL_ACTION_UNSPEC	= 0,
 | |
| 	/* node segment */
 | |
| 	SEG6_LOCAL_ACTION_END		= 1,
 | |
| 	/* adjacency segment (IPv6 cross-connect) */
 | |
| 	SEG6_LOCAL_ACTION_END_X		= 2,
 | |
| 	/* lookup of next seg NH in table */
 | |
| 	SEG6_LOCAL_ACTION_END_T		= 3,
 | |
| 	/* decap and L2 cross-connect */
 | |
| 	SEG6_LOCAL_ACTION_END_DX2	= 4,
 | |
| 	/* decap and IPv6 cross-connect */
 | |
| 	SEG6_LOCAL_ACTION_END_DX6	= 5,
 | |
| 	/* decap and IPv4 cross-connect */
 | |
| 	SEG6_LOCAL_ACTION_END_DX4	= 6,
 | |
| 	/* decap and lookup of DA in v6 table */
 | |
| 	SEG6_LOCAL_ACTION_END_DT6	= 7,
 | |
| 	/* decap and lookup of DA in v4 table */
 | |
| 	SEG6_LOCAL_ACTION_END_DT4	= 8,
 | |
| 	/* binding segment with insertion */
 | |
| 	SEG6_LOCAL_ACTION_END_B6	= 9,
 | |
| 	/* binding segment with encapsulation */
 | |
| 	SEG6_LOCAL_ACTION_END_B6_ENCAP	= 10,
 | |
| 	/* binding segment with MPLS encap */
 | |
| 	SEG6_LOCAL_ACTION_END_BM	= 11,
 | |
| 	/* lookup last seg in table */
 | |
| 	SEG6_LOCAL_ACTION_END_S		= 12,
 | |
| 	/* forward to SR-unaware VNF with static proxy */
 | |
| 	SEG6_LOCAL_ACTION_END_AS	= 13,
 | |
| 	/* forward to SR-unaware VNF with masquerading */
 | |
| 	SEG6_LOCAL_ACTION_END_AM	= 14,
 | |
| 
 | |
| 	__SEG6_LOCAL_ACTION_MAX,
 | |
| };
 | |
| 
 | |
| #define SEG6_LOCAL_ACTION_MAX (__SEG6_LOCAL_ACTION_MAX - 1)
 | |
| 
 | |
| #endif
 |