Brad Bishop | e42b3e3 | 2020-01-15 22:08:42 -0500 | [diff] [blame^] | 1 | From 6cf6f5b9c39dfd0d46f2069c3baeab92ae980367 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Sun, 15 Dec 2019 00:58:13 -0800 |
| 4 | Subject: [PATCH] Replace u_intXX_t with kernel typedefs |
| 5 | |
| 6 | u_intXX_t requires including sys/types.h which might not work in kernel |
| 7 | code, if this header is used in a kernel module |
| 8 | |
| 9 | Fixes |
| 10 | | In file included from ufs.c:16: |
| 11 | | In file included from ./ufs.h:9: |
| 12 | | ./scsi_bsg_util.h:131:2: error: unknown type name 'u_int16_t'; did you mean 'uint16_t'? |
| 13 | | u_int16_t result; |
| 14 | | ^~~~~~~~~ |
| 15 | |
| 16 | Upstream-Status: Submitted [https://github.com/westerndigitalcorporation/ufs-utils/pull/23] |
| 17 | |
| 18 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 19 | --- |
| 20 | scsi_bsg_util.h | 18 +++++++++--------- |
| 21 | 1 file changed, 9 insertions(+), 9 deletions(-) |
| 22 | |
| 23 | diff --git a/scsi_bsg_util.h b/scsi_bsg_util.h |
| 24 | index 3f8a482..497c3ae 100644 |
| 25 | --- a/scsi_bsg_util.h |
| 26 | +++ b/scsi_bsg_util.h |
| 27 | @@ -121,15 +121,15 @@ struct ufs_bsg_reply { |
| 28 | #endif /* SCSI_BSG_UFS_H.*/ |
| 29 | |
| 30 | struct rpmb_frame { |
| 31 | - u_int8_t stuff[196]; |
| 32 | - u_int8_t key_mac[32]; |
| 33 | - u_int8_t data[256]; |
| 34 | - u_int8_t nonce[16]; |
| 35 | - u_int32_t write_counter; |
| 36 | - u_int16_t addr; |
| 37 | - u_int16_t block_count; |
| 38 | - u_int16_t result; |
| 39 | - u_int16_t req_resp; |
| 40 | + __u8 stuff[196]; |
| 41 | + __u8 key_mac[32]; |
| 42 | + __u8 data[256]; |
| 43 | + __u8 nonce[16]; |
| 44 | + __u32 write_counter; |
| 45 | + __u16 addr; |
| 46 | + __u16 block_count; |
| 47 | + __u16 result; |
| 48 | + __u16 req_resp; |
| 49 | }; |
| 50 | |
| 51 | #define BSG_REPLY_SZ (sizeof(struct ufs_bsg_reply)) |
| 52 | -- |
| 53 | 2.24.1 |
| 54 | |