include: Sync with upstream kernel headers

Signed-off-by: Felix Janda <felix.janda@posteo.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/include/linux/netfilter_ipv4/ip_tables.h b/include/linux/netfilter_ipv4/ip_tables.h
index 57fd82a16b7da973a49c92221960ce10449b038e..38542b4f721c0b45d62ff14d27fad502523b640c 100644 (file)
--- a/include/linux/netfilter_ipv4/ip_tables.h
+++ b/include/linux/netfilter_ipv4/ip_tables.h
@@ -73,12 +73,12 @@ struct ipt_ip {
        unsigned char iniface_mask[IFNAMSIZ], outiface_mask[IFNAMSIZ];
 
        /* Protocol, 0 = ANY */
-       u_int16_t proto;
+       __u16 proto;
 
        /* Flags word */
-       u_int8_t flags;
+       __u8 flags;
        /* Inverse flags */
-       u_int8_t invflags;
+       __u8 invflags;
 };
 
 /* Values for "flag" field in struct ipt_ip (general ip structure). */
@@ -106,9 +106,9 @@ struct ipt_entry {
        unsigned int nfcache;
 
        /* Size of ipt_entry + matches */
-       u_int16_t target_offset;
+       __u16 target_offset;
        /* Size of ipt_entry + matches + target */
-       u_int16_t next_offset;
+       __u16 next_offset;
 
        /* Back pointer */
        unsigned int comefrom;
@@ -141,9 +141,9 @@ struct ipt_entry {
 
 /* ICMP matching stuff */
 struct ipt_icmp {
-       u_int8_t type;                          /* type to match */
-       u_int8_t code[2];                       /* range of code */
-       u_int8_t invflags;                      /* Inverse flags */
+       __u8 type;                              /* type to match */
+       __u8 code[2];                           /* range of code */
+       __u8 invflags;                          /* Inverse flags */
 };
 
 /* Values for "inv" field for struct ipt_icmp. */

diff --git a/include/linux/netfilter_ipv6/ip6_tables.h b/include/linux/netfilter_ipv6/ip6_tables.h
index 3f19a97da02820fcfde3dd481e86bbd73877877f..640a1d09690c29c83f4b307a984bf8818f8b2c1f 100644 (file)
--- a/include/linux/netfilter_ipv6/ip6_tables.h
+++ b/include/linux/netfilter_ipv6/ip6_tables.h
@@ -73,14 +73,14 @@ struct ip6t_ip6 {
         *   MH do not match any packets.
         * - You also need to set IP6T_FLAGS_PROTO to "flags" to check protocol.
         */
-       u_int16_t proto;
+       __u16 proto;
        /* TOS to match iff flags & IP6T_F_TOS */
-       u_int8_t tos;
+       __u8 tos;
 
        /* Flags word */
-       u_int8_t flags;
+       __u8 flags;
        /* Inverse flags */
-       u_int8_t invflags;
+       __u8 invflags;
 };
 
 /* Values for "flag" field in struct ip6t_ip6 (general ip6 structure). */
@@ -110,9 +110,9 @@ struct ip6t_entry {
        unsigned int nfcache;
 
        /* Size of ipt_entry + matches */
-       u_int16_t target_offset;
+       __u16 target_offset;
        /* Size of ipt_entry + matches + target */
-       u_int16_t next_offset;
+       __u16 next_offset;
 
        /* Back pointer */
        unsigned int comefrom;
@@ -176,11 +176,14 @@ struct ip6t_error {
 #define IP6T_SO_GET_REVISION_TARGET    (IP6T_BASE_CTL + 5)
 #define IP6T_SO_GET_MAX                        IP6T_SO_GET_REVISION_TARGET
 
+/* obtain original address if REDIRECT'd connection */
+#define IP6T_SO_ORIGINAL_DST            80
+
 /* ICMP matching stuff */
 struct ip6t_icmp {
-       u_int8_t type;                          /* type to match */
-       u_int8_t code[2];                       /* range of code */
-       u_int8_t invflags;                      /* Inverse flags */
+       __u8 type;                              /* type to match */
+       __u8 code[2];                           /* range of code */
+       __u8 invflags;                          /* Inverse flags */
 };
 
 /* Values for "inv" field for struct ipt_icmp. */