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>
42 lines
1.2 KiB
C
42 lines
1.2 KiB
C
/* atmarp.h - ATM ARP protocol and kernel-demon interface definitions */
|
|
|
|
/* Written 1995-1999 by Werner Almesberger, EPFL LRC/ICA */
|
|
|
|
|
|
#ifndef _LINUX_ATMARP_H
|
|
#define _LINUX_ATMARP_H
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/atmapi.h>
|
|
#include <linux/atmioc.h>
|
|
|
|
|
|
#define ATMARP_RETRY_DELAY 30 /* request next resolution or forget
|
|
NAK after 30 sec - should go into
|
|
atmclip.h */
|
|
#define ATMARP_MAX_UNRES_PACKETS 5 /* queue that many packets while
|
|
waiting for the resolver */
|
|
|
|
|
|
#define ATMARPD_CTRL _IO('a',ATMIOC_CLIP+1) /* become atmarpd ctrl sock */
|
|
#define ATMARP_MKIP _IO('a',ATMIOC_CLIP+2) /* attach socket to IP */
|
|
#define ATMARP_SETENTRY _IO('a',ATMIOC_CLIP+3) /* fill or hide ARP entry */
|
|
#define ATMARP_ENCAP _IO('a',ATMIOC_CLIP+5) /* change encapsulation */
|
|
|
|
|
|
enum atmarp_ctrl_type {
|
|
act_invalid, /* catch uninitialized structures */
|
|
act_need, /* need address resolution */
|
|
act_up, /* interface is coming up */
|
|
act_down, /* interface is going down */
|
|
act_change /* interface configuration has changed */
|
|
};
|
|
|
|
struct atmarp_ctrl {
|
|
enum atmarp_ctrl_type type; /* message type */
|
|
int itf_num;/* interface number (if present) */
|
|
__be32 ip; /* IP address (act_need only) */
|
|
};
|
|
|
|
#endif
|