diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-02-27 15:48:53 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-02-27 15:48:53 -0800 |
| commit | c3eaa1a725dc304b4551ca70d986fe07c2708a32 (patch) | |
| tree | 6ea252d7da994587017f8d65830e0e24c007c64e /include/uapi/linux | |
| parent | ed990c4efc21e856961e7c3d31ca76c728aa032c (diff) | |
| parent | 119c43587e314ff2ed171b2b5acf70ebd5fbd156 (diff) | |
Merge "Merge android-4.4.175 (08d5867) into msm-4.4"
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/if_ether.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/uapi/linux/if_ether.h b/include/uapi/linux/if_ether.h index 602aca385a27..eec10ab0ab73 100644 --- a/include/uapi/linux/if_ether.h +++ b/include/uapi/linux/if_ether.h @@ -138,11 +138,18 @@ * This is an Ethernet frame header. */ +/* allow libcs like musl to deactivate this, glibc does not implement this. */ +#ifndef __UAPI_DEF_ETHHDR +#define __UAPI_DEF_ETHHDR 1 +#endif + +#if __UAPI_DEF_ETHHDR struct ethhdr { unsigned char h_dest[ETH_ALEN]; /* destination eth addr */ unsigned char h_source[ETH_ALEN]; /* source ether addr */ __be16 h_proto; /* packet type ID field */ } __attribute__((packed)); +#endif #endif /* _UAPI_LINUX_IF_ETHER_H */ |