diff options
| author | Christopher Ferris <cferris@google.com> | 2014-09-03 19:56:49 -0700 |
|---|---|---|
| committer | Christopher Ferris <cferris@google.com> | 2014-09-17 17:05:17 -0700 |
| commit | ba8d4f460b51161eb82cf1006cb34a3cc1389f47 (patch) | |
| tree | f15ca2fce81d0151d51a6cbbe8bad11513c98c46 /libc/kernel/uapi/linux/if_fddi.h | |
| parent | 6a310f4ad6c06b6f513d6dd9784ce0377f94f9bd (diff) | |
| download | bionic-ba8d4f460b51161eb82cf1006cb34a3cc1389f47.zip bionic-ba8d4f460b51161eb82cf1006cb34a3cc1389f47.tar.gz bionic-ba8d4f460b51161eb82cf1006cb34a3cc1389f47.tar.bz2 | |
Update kernel uapi headers to v3.16.1.
Other changes to support the new headers:
- Remove the flock64 structure it is defined in the new headers.
- Update the syscalls to correspond with the headers.
Change-Id: I49a6b07e8b2bfffb67be71b07b58e4e6848fcc09
Diffstat (limited to 'libc/kernel/uapi/linux/if_fddi.h')
| -rw-r--r-- | libc/kernel/uapi/linux/if_fddi.h | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/libc/kernel/uapi/linux/if_fddi.h b/libc/kernel/uapi/linux/if_fddi.h index 699ae44..cee18c0 100644 --- a/libc/kernel/uapi/linux/if_fddi.h +++ b/libc/kernel/uapi/linux/if_fddi.h @@ -31,43 +31,43 @@ #define FDDI_K_LLC_ZLEN 13 #define FDDI_K_LLC_LEN 4491 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define FDDI_K_OUI_LEN 3 #define FDDI_FC_K_VOID 0x00 #define FDDI_FC_K_NON_RESTRICTED_TOKEN 0x80 #define FDDI_FC_K_RESTRICTED_TOKEN 0xC0 -#define FDDI_FC_K_SMT_MIN 0x41 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define FDDI_FC_K_SMT_MIN 0x41 #define FDDI_FC_K_SMT_MAX 0x4F #define FDDI_FC_K_MAC_MIN 0xC1 #define FDDI_FC_K_MAC_MAX 0xCF -#define FDDI_FC_K_ASYNC_LLC_MIN 0x50 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define FDDI_FC_K_ASYNC_LLC_MIN 0x50 #define FDDI_FC_K_ASYNC_LLC_DEF 0x54 #define FDDI_FC_K_ASYNC_LLC_MAX 0x5F #define FDDI_FC_K_SYNC_LLC_MIN 0xD0 -#define FDDI_FC_K_SYNC_LLC_MAX 0xD7 /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define FDDI_FC_K_SYNC_LLC_MAX 0xD7 #define FDDI_FC_K_IMPLEMENTOR_MIN 0x60 #define FDDI_FC_K_IMPLEMENTOR_MAX 0x6F #define FDDI_FC_K_RESERVED_MIN 0x70 -#define FDDI_FC_K_RESERVED_MAX 0x7F /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +#define FDDI_FC_K_RESERVED_MAX 0x7F #define FDDI_EXTENDED_SAP 0xAA #define FDDI_UI_CMD 0x03 struct fddi_8022_1_hdr { - __u8 dsap; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + __u8 dsap; __u8 ssap; __u8 ctrl; } __attribute__((packed)); -struct fddi_8022_2_hdr { /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ +struct fddi_8022_2_hdr { __u8 dsap; __u8 ssap; __u8 ctrl_1; - __u8 ctrl_2; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + __u8 ctrl_2; } __attribute__((packed)); -#define FDDI_K_OUI_LEN 3 struct fddi_snap_hdr { __u8 dsap; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ @@ -82,13 +82,12 @@ struct fddihdr { __u8 daddr[FDDI_K_ALEN]; /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ __u8 saddr[FDDI_K_ALEN]; - union - { + union { struct fddi_8022_1_hdr llc_8022_1; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct fddi_8022_2_hdr llc_8022_2; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ struct fddi_snap_hdr llc_snap; } hdr; } __attribute__((packed)); -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #endif +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ |