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/l2tp.h | |
| parent | 6a310f4ad6c06b6f513d6dd9784ce0377f94f9bd (diff) | |
| download | android_bionic-ba8d4f460b51161eb82cf1006cb34a3cc1389f47.tar.gz android_bionic-ba8d4f460b51161eb82cf1006cb34a3cc1389f47.tar.bz2 android_bionic-ba8d4f460b51161eb82cf1006cb34a3cc1389f47.zip | |
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/l2tp.h')
| -rw-r--r-- | libc/kernel/uapi/linux/l2tp.h | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/libc/kernel/uapi/linux/l2tp.h b/libc/kernel/uapi/linux/l2tp.h index 818cda415..0bc4dd3e7 100644 --- a/libc/kernel/uapi/linux/l2tp.h +++ b/libc/kernel/uapi/linux/l2tp.h @@ -106,54 +106,56 @@ enum { L2TP_ATTR_IP6_SADDR, L2TP_ATTR_IP6_DADDR, /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + L2TP_ATTR_UDP_ZERO_CSUM6_TX, + L2TP_ATTR_UDP_ZERO_CSUM6_RX, __L2TP_ATTR_MAX, }; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define L2TP_ATTR_MAX (__L2TP_ATTR_MAX - 1) enum { -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ L2TP_ATTR_STATS_NONE, L2TP_ATTR_TX_PACKETS, +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ L2TP_ATTR_TX_BYTES, L2TP_ATTR_TX_ERRORS, -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ L2TP_ATTR_RX_PACKETS, L2TP_ATTR_RX_BYTES, +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ L2TP_ATTR_RX_SEQ_DISCARDS, L2TP_ATTR_RX_OOS_PACKETS, -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ L2TP_ATTR_RX_ERRORS, __L2TP_ATTR_STATS_MAX, +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ }; #define L2TP_ATTR_STATS_MAX (__L2TP_ATTR_STATS_MAX - 1) -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ enum l2tp_pwtype { L2TP_PWTYPE_NONE = 0x0000, +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ L2TP_PWTYPE_ETH_VLAN = 0x0004, L2TP_PWTYPE_ETH = 0x0005, -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ L2TP_PWTYPE_PPP = 0x0007, L2TP_PWTYPE_PPP_AC = 0x0008, +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ L2TP_PWTYPE_IP = 0x000b, __L2TP_PWTYPE_MAX -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ }; enum l2tp_l2spec_type { +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ L2TP_L2SPECTYPE_NONE, L2TP_L2SPECTYPE_DEFAULT, -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ }; enum l2tp_encap_type { +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ L2TP_ENCAPTYPE_UDP, L2TP_ENCAPTYPE_IP, -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ }; enum l2tp_seqmode { +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ L2TP_SEQ_NONE = 0, L2TP_SEQ_IP = 1, -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ L2TP_SEQ_ALL = 2, }; +/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define L2TP_GENL_NAME "l2tp" #define L2TP_GENL_VERSION 0x1 -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #endif |