mirror of
https://git.proxmox.com/git/mirror_iproute2
synced 2025-10-06 10:57:52 +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>
24 lines
609 B
C
24 lines
609 B
C
/* Copyright (c) 2015 6WIND S.A.
|
|
* Author: Nicolas Dichtel <nicolas.dichtel@6wind.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* 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_
|
|
|
|
/* Attributes of RTM_NEWNSID/RTM_GETNSID messages */
|
|
enum {
|
|
NETNSA_NONE,
|
|
#define NETNSA_NSID_NOT_ASSIGNED -1
|
|
NETNSA_NSID,
|
|
NETNSA_PID,
|
|
NETNSA_FD,
|
|
__NETNSA_MAX,
|
|
};
|
|
|
|
#define NETNSA_MAX (__NETNSA_MAX - 1)
|
|
|
|
#endif /* _LINUX_NET_NAMESPACE_H_ */
|