package/libs/libnetfilter-log/patches/0008-include-Sync-with-current-kernel-headers.patch

   1 From 721ea5ec049e12afdd7c182f2899ab6d92914e68 Mon Sep 17 00:00:00 2001
   2 From: Ken-ichirou MATSUZAWA <chamaken@gmail.com>
   3 Date: Fri, 11 Sep 2015 12:12:11 +0900
   4 Subject: include: Sync with kernel headers
   5
   6 Signed-off-by: Ken-ichirou MATSUZAWA <chamas@h4.dion.ne.jp>
   7 Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
   8 ---
   9  include/libnetfilter_log/linux_nfnetlink_log.h | 9 ++++-----
  10  1 file changed, 4 insertions(+), 5 deletions(-)
  11
  12 diff --git a/include/libnetfilter_log/linux_nfnetlink_log.h b/include/libnetfilter_log/linux_nfnetlink_log.h
  13 index 9f38277..081e7f9 100644
  14 --- a/include/libnetfilter_log/linux_nfnetlink_log.h
  15 +++ b/include/libnetfilter_log/linux_nfnetlink_log.h
  16 @@ -1,16 +1,12 @@
  17  #ifndef _NFNETLINK_LOG_H
  18  #define _NFNETLINK_LOG_H
  19
  20 -#ifndef aligned_u64
  21 -#define aligned_u64 unsigned long long __attribute__((aligned(8)))
  22 -#endif
  23 -
  24  /* This file describes the netlink messages (i.e. 'protocol packets'),
  25   * and not any kind of function definitions.  It is shared between kernel and
  26   * userspace.  Don't put kernel specific stuff in here */
  27
  28  #include <linux/types.h>
  29 -#include <libnfnetlink/linux_nfnetlink.h>
  30 +#include <linux/netfilter/nfnetlink.h>
  31
  32  enum nfulnl_msg_types {
  33         NFULNL_MSG_PACKET,              /* packet from kernel to userspace */
  34 @@ -55,6 +51,8 @@ enum nfulnl_attr_type {
  35         NFULA_HWTYPE,                   /* hardware type */
  36         NFULA_HWHEADER,                 /* hardware header */
  37         NFULA_HWLEN,                    /* hardware header length */
  38 +       NFULA_CT,                       /* nf_conntrack_netlink.h */
  39 +       NFULA_CT_INFO,                  /* enum ip_conntrack_info */
  40
  41         __NFULA_MAX
  42  };
  43 @@ -97,5 +95,6 @@ enum nfulnl_attr_config {
  44
  45  #define NFULNL_CFG_F_SEQ       0x0001
  46  #define NFULNL_CFG_F_SEQ_GLOBAL        0x0002
  47 +#define NFULNL_CFG_F_CONNTRACK 0x0004
  48
  49  #endif /* _NFNETLINK_LOG_H */
  50 --
  51 2.11.0
  52