Pull ec into release branch

[linux-2.6-omap-h63xx.git] / include / linux / netfilter / nfnetlink_queue.h

diff --git a/include/linux/netfilter/nfnetlink_queue.h b/include/linux/netfilter/nfnetlink_queue.h
index e142b0ff7c08b6e1bb05939897b62e2fabfabbae..83e789633e353c4b42e48e0aa2b7b4c444b6aea0 100644 (file)
--- a/include/linux/netfilter/nfnetlink_queue.h
+++ b/include/linux/netfilter/nfnetlink_queue.h
@@ -1,6 +1,7 @@
 #ifndef _NFNETLINK_QUEUE_H
 #define _NFNETLINK_QUEUE_H
 
+#include <linux/types.h>
 #include <linux/netfilter/nfnetlink.h>
 
 enum nfqnl_msg_types {
@@ -12,21 +13,21 @@ enum nfqnl_msg_types {
 };
 
 struct nfqnl_msg_packet_hdr {
-       u_int32_t       packet_id;      /* unique ID of packet in queue */
-       u_int16_t       hw_protocol;    /* hw protocol (network order) */
+       __be32          packet_id;      /* unique ID of packet in queue */
+       __be16          hw_protocol;    /* hw protocol (network order) */
        u_int8_t        hook;           /* netfilter hook */
 } __attribute__ ((packed));
 
 struct nfqnl_msg_packet_hw {
-       u_int16_t       hw_addrlen;
+       __be16          hw_addrlen;
        u_int16_t       _pad;
        u_int8_t        hw_addr[8];
-} __attribute__ ((packed));
+};
 
 struct nfqnl_msg_packet_timestamp {
-       u_int64_t       sec;
-       u_int64_t       usec;
-} __attribute__ ((packed));
+       aligned_be64    sec;
+       aligned_be64    usec;
+};
 
 enum nfqnl_attr_type {
        NFQA_UNSPEC,
@@ -36,6 +37,8 @@ enum nfqnl_attr_type {
        NFQA_TIMESTAMP,                 /* nfqnl_msg_packet_timestamp */
        NFQA_IFINDEX_INDEV,             /* u_int32_t ifindex */
        NFQA_IFINDEX_OUTDEV,            /* u_int32_t ifindex */
+       NFQA_IFINDEX_PHYSINDEV,         /* u_int32_t ifindex */
+       NFQA_IFINDEX_PHYSOUTDEV,        /* u_int32_t ifindex */
        NFQA_HWADDR,                    /* nfqnl_msg_packet_hw */
        NFQA_PAYLOAD,                   /* opaque data payload */
 
@@ -44,9 +47,9 @@ enum nfqnl_attr_type {
 #define NFQA_MAX (__NFQA_MAX - 1)
 
 struct nfqnl_msg_verdict_hdr {
-       u_int32_t verdict;
-       u_int32_t id;
-} __attribute__ ((packed));
+       __be32 verdict;
+       __be32 id;
+};
 
 
 enum nfqnl_msg_config_cmds {
@@ -60,8 +63,8 @@ enum nfqnl_msg_config_cmds {
 struct nfqnl_msg_config_cmd {
        u_int8_t        command;        /* nfqnl_msg_config_cmds */
        u_int8_t        _pad;
-       u_int16_t       pf;             /* AF_xxx for PF_[UN]BIND */
-} __attribute__ ((packed));
+       __be16          pf;             /* AF_xxx for PF_[UN]BIND */
+};
 
 enum nfqnl_config_mode {
        NFQNL_COPY_NONE,
@@ -70,7 +73,7 @@ enum nfqnl_config_mode {
 };
 
 struct nfqnl_msg_config_params {
-       u_int32_t       copy_range;
+       __be32          copy_range;
        u_int8_t        copy_mode;      /* enum nfqnl_config_mode */
 } __attribute__ ((packed));
 
@@ -79,6 +82,7 @@ enum nfqnl_attr_config {
        NFQA_CFG_UNSPEC,
        NFQA_CFG_CMD,                   /* nfqnl_msg_config_cmd */
        NFQA_CFG_PARAMS,                /* nfqnl_msg_config_params */
+       NFQA_CFG_QUEUE_MAXLEN,          /* u_int32_t */
        __NFQA_CFG_MAX
 };
 #define NFQA_CFG_MAX (__NFQA_CFG_MAX-1)