netfilter: remove IPvX specific parts from nf_conntrack_l4proto.h
Moving the structure definitions to the corresponding IPvX specific header files. Signed-off-by: Patrick McHardy <kaber@trash.net>
This commit is contained in:
parent
c7a913cd55
commit
9d2493f88f
|
@ -90,10 +90,7 @@ struct nf_conntrack_l4proto
|
||||||
struct module *me;
|
struct module *me;
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Existing built-in protocols */
|
/* Existing built-in generic protocol */
|
||||||
extern struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp6;
|
|
||||||
extern struct nf_conntrack_l4proto nf_conntrack_l4proto_udp4;
|
|
||||||
extern struct nf_conntrack_l4proto nf_conntrack_l4proto_udp6;
|
|
||||||
extern struct nf_conntrack_l4proto nf_conntrack_l4proto_generic;
|
extern struct nf_conntrack_l4proto nf_conntrack_l4proto_generic;
|
||||||
|
|
||||||
#define MAX_NF_CT_PROTO 256
|
#define MAX_NF_CT_PROTO 256
|
||||||
|
|
|
@ -26,6 +26,7 @@
|
||||||
#include <net/netfilter/nf_conntrack_l4proto.h>
|
#include <net/netfilter/nf_conntrack_l4proto.h>
|
||||||
#include <net/netfilter/nf_conntrack_l3proto.h>
|
#include <net/netfilter/nf_conntrack_l3proto.h>
|
||||||
#include <net/netfilter/nf_conntrack_core.h>
|
#include <net/netfilter/nf_conntrack_core.h>
|
||||||
|
#include <net/netfilter/ipv6/nf_conntrack_ipv6.h>
|
||||||
|
|
||||||
static bool ipv6_pkt_to_tuple(const struct sk_buff *skb, unsigned int nhoff,
|
static bool ipv6_pkt_to_tuple(const struct sk_buff *skb, unsigned int nhoff,
|
||||||
struct nf_conntrack_tuple *tuple)
|
struct nf_conntrack_tuple *tuple)
|
||||||
|
|
|
@ -25,6 +25,8 @@
|
||||||
#include <net/netfilter/nf_conntrack_l4proto.h>
|
#include <net/netfilter/nf_conntrack_l4proto.h>
|
||||||
#include <net/netfilter/nf_conntrack_ecache.h>
|
#include <net/netfilter/nf_conntrack_ecache.h>
|
||||||
#include <net/netfilter/nf_log.h>
|
#include <net/netfilter/nf_log.h>
|
||||||
|
#include <net/netfilter/ipv4/nf_conntrack_ipv4.h>
|
||||||
|
#include <net/netfilter/ipv6/nf_conntrack_ipv6.h>
|
||||||
|
|
||||||
/* Protects ct->proto.tcp */
|
/* Protects ct->proto.tcp */
|
||||||
static DEFINE_RWLOCK(tcp_lock);
|
static DEFINE_RWLOCK(tcp_lock);
|
||||||
|
|
|
@ -22,6 +22,8 @@
|
||||||
#include <net/netfilter/nf_conntrack_l4proto.h>
|
#include <net/netfilter/nf_conntrack_l4proto.h>
|
||||||
#include <net/netfilter/nf_conntrack_ecache.h>
|
#include <net/netfilter/nf_conntrack_ecache.h>
|
||||||
#include <net/netfilter/nf_log.h>
|
#include <net/netfilter/nf_log.h>
|
||||||
|
#include <net/netfilter/ipv4/nf_conntrack_ipv4.h>
|
||||||
|
#include <net/netfilter/ipv6/nf_conntrack_ipv6.h>
|
||||||
|
|
||||||
static unsigned int nf_ct_udp_timeout __read_mostly = 30*HZ;
|
static unsigned int nf_ct_udp_timeout __read_mostly = 30*HZ;
|
||||||
static unsigned int nf_ct_udp_timeout_stream __read_mostly = 180*HZ;
|
static unsigned int nf_ct_udp_timeout_stream __read_mostly = 180*HZ;
|
||||||
|
|
Loading…
Reference in a new issue