diff options
| author | Ben Cheng <bccheng@google.com> | 2012-03-07 16:14:53 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-07 16:14:53 -0800 |
| commit | 4b29af0a1b8b25b43e4c0cb9bf066c52f3add9bd (patch) | |
| tree | 81138dd64a4b9ea18c3cfd5c69783add6deeb201 /libc/kernel/common/linux/smb.h | |
| parent | 94a85f663694e1869acb1c2e8a3c374a6fa3ab86 (diff) | |
| download | android_bionic-4b29af0a1b8b25b43e4c0cb9bf066c52f3add9bd.tar.gz android_bionic-4b29af0a1b8b25b43e4c0cb9bf066c52f3add9bd.tar.bz2 android_bionic-4b29af0a1b8b25b43e4c0cb9bf066c52f3add9bd.zip | |
Revert "Update bionic kernel headers using update_all.py"
This reverts commit 94a85f663694e1869acb1c2e8a3c374a6fa3ab86
There is a smoke test failure for Prime but Crespo/Stingray are fine. Will revert the change for now until further investigation is made.
Diffstat (limited to 'libc/kernel/common/linux/smb.h')
| -rw-r--r-- | libc/kernel/common/linux/smb.h | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/libc/kernel/common/linux/smb.h b/libc/kernel/common/linux/smb.h index 68ec88b90..72c896711 100644 --- a/libc/kernel/common/linux/smb.h +++ b/libc/kernel/common/linux/smb.h @@ -7,60 +7,55 @@ *** structures, and macros generated from the original header, and thus, *** contains no copyrightable information. *** - *** To edit the content of this header, modify the corresponding - *** source file (e.g. under external/kernel-headers/original/) then - *** run bionic/libc/kernel/tools/update_all.py - *** - *** Any manual change here will be lost the next time this script will - *** be run. You've been warned! - *** **************************************************************************** ****************************************************************************/ #ifndef _LINUX_SMB_H #define _LINUX_SMB_H + #include <linux/types.h> + enum smb_protocol { -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ SMB_PROTOCOL_NONE, SMB_PROTOCOL_CORE, SMB_PROTOCOL_COREPLUS, SMB_PROTOCOL_LANMAN1, -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ SMB_PROTOCOL_LANMAN2, SMB_PROTOCOL_NT1 }; + enum smb_case_hndl { -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ SMB_CASE_DEFAULT, SMB_CASE_LOWER, SMB_CASE_UPPER }; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + struct smb_dskattr { __u16 total; __u16 allocblocks; __u16 blocksize; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ __u16 free; }; + struct smb_conn_opt { + unsigned int fd; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ + enum smb_protocol protocol; enum smb_case_hndl case_handling; + __u32 max_xmit; __u16 server_uid; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ __u16 tid; + __u16 secmode; __u16 maxmux; __u16 maxvcs; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ __u16 rawmode; __u32 sesskey; + __u32 maxraw; __u32 capabilities; -/* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ __s16 serverzone; }; + #endif |