Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

[cascardo/linux.git] / include / linux / netfilter / nfnetlink_log.h

diff --git a/include/linux/netfilter/nfnetlink_log.h b/include/linux/netfilter/nfnetlink_log.h
index f661731..d3bab7a 100644 (file)
--- a/include/linux/netfilter/nfnetlink_log.h
+++ b/include/linux/netfilter/nfnetlink_log.h
@@ -17,14 +17,14 @@ enum nfulnl_msg_types {
 
 struct nfulnl_msg_packet_hdr {
        __be16          hw_protocol;    /* hw protocol (network order) */
-       u_int8_t        hook;           /* netfilter hook */
-       u_int8_t        _pad;
+       __u8    hook;           /* netfilter hook */
+       __u8    _pad;
 };
 
 struct nfulnl_msg_packet_hw {
        __be16          hw_addrlen;
-       u_int16_t       _pad;
-       u_int8_t        hw_addr[8];
+       __u16   _pad;
+       __u8    hw_addr[8];
 };
 
 struct nfulnl_msg_packet_timestamp {
@@ -35,12 +35,12 @@ struct nfulnl_msg_packet_timestamp {
 enum nfulnl_attr_type {
        NFULA_UNSPEC,
        NFULA_PACKET_HDR,
-       NFULA_MARK,                     /* u_int32_t nfmark */
+       NFULA_MARK,                     /* __u32 nfmark */
        NFULA_TIMESTAMP,                /* nfulnl_msg_packet_timestamp */
-       NFULA_IFINDEX_INDEV,            /* u_int32_t ifindex */
-       NFULA_IFINDEX_OUTDEV,           /* u_int32_t ifindex */
-       NFULA_IFINDEX_PHYSINDEV,        /* u_int32_t ifindex */
-       NFULA_IFINDEX_PHYSOUTDEV,       /* u_int32_t ifindex */
+       NFULA_IFINDEX_INDEV,            /* __u32 ifindex */
+       NFULA_IFINDEX_OUTDEV,           /* __u32 ifindex */
+       NFULA_IFINDEX_PHYSINDEV,        /* __u32 ifindex */
+       NFULA_IFINDEX_PHYSOUTDEV,       /* __u32 ifindex */
        NFULA_HWADDR,                   /* nfulnl_msg_packet_hw */
        NFULA_PAYLOAD,                  /* opaque data payload */
        NFULA_PREFIX,                   /* string prefix */
@@ -65,23 +65,23 @@ enum nfulnl_msg_config_cmds {
 };
 
 struct nfulnl_msg_config_cmd {
-       u_int8_t        command;        /* nfulnl_msg_config_cmds */
+       __u8    command;        /* nfulnl_msg_config_cmds */
 } __attribute__ ((packed));
 
 struct nfulnl_msg_config_mode {
        __be32          copy_range;
-       u_int8_t        copy_mode;
-       u_int8_t        _pad;
+       __u8    copy_mode;
+       __u8    _pad;
 } __attribute__ ((packed));
 
 enum nfulnl_attr_config {
        NFULA_CFG_UNSPEC,
        NFULA_CFG_CMD,                  /* nfulnl_msg_config_cmd */
        NFULA_CFG_MODE,                 /* nfulnl_msg_config_mode */
-       NFULA_CFG_NLBUFSIZ,             /* u_int32_t buffer size */
-       NFULA_CFG_TIMEOUT,              /* u_int32_t in 1/100 s */
-       NFULA_CFG_QTHRESH,              /* u_int32_t */
-       NFULA_CFG_FLAGS,                /* u_int16_t */
+       NFULA_CFG_NLBUFSIZ,             /* __u32 buffer size */
+       NFULA_CFG_TIMEOUT,              /* __u32 in 1/100 s */
+       NFULA_CFG_QTHRESH,              /* __u32 */
+       NFULA_CFG_FLAGS,                /* __u16 */
        __NFULA_CFG_MAX
 };
 #define NFULA_CFG_MAX (__NFULA_CFG_MAX -1)