update

[l4.git] / l4 / pkg / linux-26-headers / include / linux / netfilter / nfnetlink.h

diff --git a/l4/pkg/linux-26-headers/include/linux/netfilter/nfnetlink.h b/l4/pkg/linux-26-headers/include/linux/netfilter/nfnetlink.h
index 0d8424f76899f11d5c96dce8d525c1f54fbe4b1a..9cd235b6f2fbff7471ef3b32d8e6d9c243869228 100644 (file)
--- a/l4/pkg/linux-26-headers/include/linux/netfilter/nfnetlink.h
+++ b/l4/pkg/linux-26-headers/include/linux/netfilter/nfnetlink.h
@@ -25,8 +25,8 @@ enum nfnetlink_groups {
 /* General form of address family dependent message.
  */
 struct nfgenmsg {
-       u_int8_t  nfgen_family;         /* AF_xxx */
-       u_int8_t  version;              /* nfnetlink version */
+       __u8  nfgen_family;             /* AF_xxx */
+       __u8  version;          /* nfnetlink version */
        __be16    res_id;               /* resource id */
 };
 
@@ -46,40 +46,11 @@ struct nfgenmsg {
 #define NFNL_SUBSYS_CTNETLINK_EXP      2
 #define NFNL_SUBSYS_QUEUE              3
 #define NFNL_SUBSYS_ULOG               4
-#define NFNL_SUBSYS_COUNT              5
-
-#ifdef __KERNEL__
-
-#include <linux/netlink.h>
-#include <linux/capability.h>
-#include <net/netlink.h>
-
-struct nfnl_callback
-{
-       int (*call)(struct sock *nl, struct sk_buff *skb, 
-               struct nlmsghdr *nlh, struct nlattr *cda[]);
-       const struct nla_policy *policy;        /* netlink attribute policy */
-       const u_int16_t attr_count;             /* number of nlattr's */
-};
-
-struct nfnetlink_subsystem
-{
-       const char *name;
-       __u8 subsys_id;                 /* nfnetlink subsystem ID */
-       __u8 cb_count;                  /* number of callbacks */
-       const struct nfnl_callback *cb; /* callback for individual types */
-};
-
-extern int nfnetlink_subsys_register(const struct nfnetlink_subsystem *n);
-extern int nfnetlink_subsys_unregister(const struct nfnetlink_subsystem *n);
-
-extern int nfnetlink_has_listeners(unsigned int group);
-extern int nfnetlink_send(struct sk_buff *skb, u32 pid, unsigned group, 
-                         int echo);
-extern int nfnetlink_unicast(struct sk_buff *skb, u_int32_t pid, int flags);
-
-#define MODULE_ALIAS_NFNL_SUBSYS(subsys) \
-       MODULE_ALIAS("nfnetlink-subsys-" __stringify(subsys))
-
-#endif /* __KERNEL__ */
-#endif /* _NFNETLINK_H */
+#define NFNL_SUBSYS_OSF                        5
+#define NFNL_SUBSYS_IPSET              6
+#define NFNL_SUBSYS_ACCT               7
+#define NFNL_SUBSYS_CTNETLINK_TIMEOUT  8
+#define NFNL_SUBSYS_CTHELPER           9
+#define NFNL_SUBSYS_COUNT              10
+
+#endif /* _NFNETLINK_H */