Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

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

diff --git a/include/linux/netfilter/nfnetlink_log.h b/include/linux/netfilter/nfnetlink_log.h
index a61836a083e733a921fd4b532f347c9ae8b0f3cb..5966afa026e958482f871f4b83f737eb671ffbf9 100644 (file)
--- a/include/linux/netfilter/nfnetlink_log.h
+++ b/include/linux/netfilter/nfnetlink_log.h
@@ -5,6 +5,7 @@
  * and not any kind of function definitions.  It is shared between kernel and
  * userspace.  Don't put kernel specific stuff in here */
 
+#include <linux/types.h>
 #include <linux/netfilter/nfnetlink.h>
 
 enum nfulnl_msg_types {
@@ -15,23 +16,21 @@ enum nfulnl_msg_types {
 };
 
 struct nfulnl_msg_packet_hdr {
-       u_int16_t       hw_protocol;    /* hw protocol (network order) */
+       __be16          hw_protocol;    /* hw protocol (network order) */
        u_int8_t        hook;           /* netfilter hook */
        u_int8_t        _pad;
-} __attribute__ ((packed));
+};
 
 struct nfulnl_msg_packet_hw {
-       u_int16_t       hw_addrlen;
+       __be16          hw_addrlen;
        u_int16_t       _pad;
        u_int8_t        hw_addr[8];
-} __attribute__ ((packed));
+};
 
 struct nfulnl_msg_packet_timestamp {
-       u_int64_t       sec;
-       u_int64_t       usec;
-} __attribute__ ((packed));
-
-#define NFULNL_PREFIXLEN       30      /* just like old log target */
+       aligned_be64    sec;
+       aligned_be64    usec;
+};
 
 enum nfulnl_attr_type {
        NFULA_UNSPEC,
@@ -46,6 +45,8 @@ enum nfulnl_attr_type {
        NFULA_PAYLOAD,                  /* opaque data payload */
        NFULA_PREFIX,                   /* string prefix */
        NFULA_UID,                      /* user id of socket */
+       NFULA_SEQ,                      /* instance-local sequence number */
+       NFULA_SEQ_GLOBAL,               /* global sequence number */
 
        __NFULA_MAX
 };
@@ -64,7 +65,7 @@ struct nfulnl_msg_config_cmd {
 } __attribute__ ((packed));
 
 struct nfulnl_msg_config_mode {
-       u_int32_t       copy_range;
+       __be32          copy_range;
        u_int8_t        copy_mode;
        u_int8_t        _pad;
 } __attribute__ ((packed));
@@ -76,6 +77,7 @@ enum nfulnl_attr_config {
        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_MAX
 };
 #define NFULA_CFG_MAX (__NFULA_CFG_MAX -1)
@@ -84,4 +86,7 @@ enum nfulnl_attr_config {
 #define NFULNL_COPY_META       0x01
 #define NFULNL_COPY_PACKET     0x02
 
+#define NFULNL_CFG_F_SEQ       0x0001
+#define NFULNL_CFG_F_SEQ_GLOBAL        0x0002
+
 #endif /* _NFNETLINK_LOG_H */