mirror of
https://git.proxmox.com/git/mirror_iproute2
synced 2025-10-05 18:56:02 +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>
42 lines
1.5 KiB
C
42 lines
1.5 KiB
C
/* atmioc.h - ranges for ATM-related ioctl numbers */
|
|
|
|
/* Written 1995-1999 by Werner Almesberger, EPFL LRC/ICA */
|
|
|
|
|
|
/*
|
|
* See http://icawww1.epfl.ch/linux-atm/magic.html for the complete list of
|
|
* "magic" ioctl numbers.
|
|
*/
|
|
|
|
|
|
#ifndef _LINUX_ATMIOC_H
|
|
#define _LINUX_ATMIOC_H
|
|
|
|
#include <asm/ioctl.h>
|
|
/* everybody including atmioc.h will also need _IO{,R,W,WR} */
|
|
|
|
#define ATMIOC_PHYCOM 0x00 /* PHY device common ioctls, globally unique */
|
|
#define ATMIOC_PHYCOM_END 0x0f
|
|
#define ATMIOC_PHYTYP 0x10 /* PHY dev type ioctls, unique per PHY type */
|
|
#define ATMIOC_PHYTYP_END 0x2f
|
|
#define ATMIOC_PHYPRV 0x30 /* PHY dev private ioctls, unique per driver */
|
|
#define ATMIOC_PHYPRV_END 0x4f
|
|
#define ATMIOC_SARCOM 0x50 /* SAR device common ioctls, globally unique */
|
|
#define ATMIOC_SARCOM_END 0x50
|
|
#define ATMIOC_SARPRV 0x60 /* SAR dev private ioctls, unique per driver */
|
|
#define ATMIOC_SARPRV_END 0x7f
|
|
#define ATMIOC_ITF 0x80 /* Interface ioctls, globally unique */
|
|
#define ATMIOC_ITF_END 0x8f
|
|
#define ATMIOC_BACKEND 0x90 /* ATM generic backend ioctls, u. per backend */
|
|
#define ATMIOC_BACKEND_END 0xaf
|
|
/* 0xb0-0xbf: Reserved for future use */
|
|
#define ATMIOC_AREQUIPA 0xc0 /* Application requested IP over ATM, glob. u. */
|
|
#define ATMIOC_LANE 0xd0 /* LAN Emulation, globally unique */
|
|
#define ATMIOC_MPOA 0xd8 /* MPOA, globally unique */
|
|
#define ATMIOC_CLIP 0xe0 /* Classical IP over ATM control, globally u. */
|
|
#define ATMIOC_CLIP_END 0xef
|
|
#define ATMIOC_SPECIAL 0xf0 /* Special-purpose controls, globally unique */
|
|
#define ATMIOC_SPECIAL_END 0xff
|
|
|
|
#endif
|