mirror of
https://git.proxmox.com/git/mirror_iproute2
synced 2025-10-05 17:15:45 +00:00
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>
19 lines
288 B
C
19 lines
288 B
C
#ifndef __UAPI_IFE_H
|
|
#define __UAPI_IFE_H
|
|
|
|
#define IFE_METAHDRLEN 2
|
|
|
|
enum {
|
|
IFE_META_SKBMARK = 1,
|
|
IFE_META_HASHID,
|
|
IFE_META_PRIO,
|
|
IFE_META_QMAP,
|
|
IFE_META_TCINDEX,
|
|
__IFE_META_MAX
|
|
};
|
|
|
|
/*Can be overridden at runtime by module option*/
|
|
#define IFE_META_MAX (__IFE_META_MAX - 1)
|
|
|
|
#endif
|