lkml.org 
[lkml]   [2015]   [May]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 27/98] scsi_netlink.h: use __u8, __u16 and __u64 from linux/types.h
    Date
    Fixes userspace compilation errors like:

    scsi/scsi_netlink.h:43:2: error: unknown type name ‘uint8_t’

    Signed-off-by: Mikko Rapeli <mikko.rapeli@iki.fi>
    ---
    include/uapi/scsi/scsi_netlink.h | 22 +++++++++++-----------
    1 file changed, 11 insertions(+), 11 deletions(-)

    diff --git a/include/uapi/scsi/scsi_netlink.h b/include/uapi/scsi/scsi_netlink.h
    index 62b4eda..36b53a76 100644
    --- a/include/uapi/scsi/scsi_netlink.h
    +++ b/include/uapi/scsi/scsi_netlink.h
    @@ -22,8 +22,8 @@
    #ifndef SCSI_NETLINK_H
    #define SCSI_NETLINK_H

    -#include <linux/netlink.h>
    #include <linux/types.h>
    +#include <linux/netlink.h>

    /*
    * This file intended to be included by both kernel and user space
    @@ -40,12 +40,12 @@

    /* SCSI_TRANSPORT_MSG event message header */
    struct scsi_nl_hdr {
    - uint8_t version;
    - uint8_t transport;
    - uint16_t magic;
    - uint16_t msgtype;
    - uint16_t msglen;
    -} __attribute__((aligned(sizeof(uint64_t))));
    + __u8 version;
    + __u8 transport;
    + __u16 magic;
    + __u16 msgtype;
    + __u16 msglen;
    +} __attribute__((aligned(sizeof(__u64))));

    /* scsi_nl_hdr->version value */
    #define SCSI_NL_VERSION 1
    @@ -89,10 +89,10 @@ struct scsi_nl_hdr {
    */
    struct scsi_nl_host_vendor_msg {
    struct scsi_nl_hdr snlh; /* must be 1st element ! */
    - uint64_t vendor_id;
    - uint16_t host_no;
    - uint16_t vmsg_datalen;
    -} __attribute__((aligned(sizeof(uint64_t))));
    + __u64 vendor_id;
    + __u16 host_no;
    + __u16 vmsg_datalen;
    +} __attribute__((aligned(sizeof(__u64))));


    /*
    --
    2.1.4


    \
     
     \ /
      Last update: 2015-05-30 18:41    [W:4.065 / U:0.232 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site