string: factorize skip_spaces and export it to be generally available

[safe/jmp/linux-2.6] / include / linux / netfilter / xt_conntrack.h

diff --git a/include/linux/netfilter/xt_conntrack.h b/include/linux/netfilter/xt_conntrack.h
index 7ae0533..54f47a2 100644 (file)
--- a/include/linux/netfilter/xt_conntrack.h
+++ b/include/linux/netfilter/xt_conntrack.h
@@ -32,42 +32,6 @@ enum {
        XT_CONNTRACK_DIRECTION    = 1 << 12,
 };
 
-/* This is exposed to userspace, so remains frozen in time. */
-struct ip_conntrack_old_tuple
-{
-       struct {
-               __be32 ip;
-               union {
-                       __u16 all;
-               } u;
-       } src;
-
-       struct {
-               __be32 ip;
-               union {
-                       __u16 all;
-               } u;
-
-               /* The protocol. */
-               __u16 protonum;
-       } dst;
-};
-
-struct xt_conntrack_info
-{
-       unsigned int statemask, statusmask;
-
-       struct ip_conntrack_old_tuple tuple[IP_CT_DIR_MAX];
-       struct in_addr sipmsk[IP_CT_DIR_MAX], dipmsk[IP_CT_DIR_MAX];
-
-       unsigned long expires_min, expires_max;
-
-       /* Flags word */
-       __u8 flags;
-       /* Inverse flags */
-       __u8 invflags;
-};
-
 struct xt_conntrack_mtinfo1 {
        union nf_inet_addr origsrc_addr, origsrc_mask;
        union nf_inet_addr origdst_addr, origdst_mask;