make netfilter use strict integer types

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / include / linux / netfilter / xt_string.h

diff --git a/include/linux/netfilter/xt_string.h b/include/linux/netfilter/xt_string.h
index bb21dd1aee2d3ec610e73fb39a219bcd39af92d9..ecbb95fc89ed274d70b756583293ef5a81bb2891 100644 (file)
--- a/include/linux/netfilter/xt_string.h
+++ b/include/linux/netfilter/xt_string.h
@@ -1,17 +1,32 @@
 #ifndef _XT_STRING_H
 #define _XT_STRING_H
 
+#include <linux/types.h>
+
 #define XT_STRING_MAX_PATTERN_SIZE 128
 #define XT_STRING_MAX_ALGO_NAME_SIZE 16
 
+enum {
+       XT_STRING_FLAG_INVERT           = 0x01,
+       XT_STRING_FLAG_IGNORECASE       = 0x02
+};
+
 struct xt_string_info
 {
-       u_int16_t from_offset;
-       u_int16_t to_offset;
+       __u16 from_offset;
+       __u16 to_offset;
        char      algo[XT_STRING_MAX_ALGO_NAME_SIZE];
        char      pattern[XT_STRING_MAX_PATTERN_SIZE];
-       u_int8_t  patlen;
-       u_int8_t  invert;
+       __u8  patlen;
+       union {
+               struct {
+                       __u8  invert;
+               } v0;
+
+               struct {
+                       __u8  flags;
+               } v1;
+       } u;
 
        /* Used internally by the kernel */
        struct ts_config __attribute__((aligned(8))) *config;