Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d2493f8 authored by Christoph Paasch's avatar Christoph Paasch Committed by Patrick McHardy
Browse files

netfilter: remove IPvX specific parts from nf_conntrack_l4proto.h 



Moving the structure definitions to the corresponding IPvX specific header files.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent c7a913cd

include/net/netfilter/nf_conntrack_l4proto.h

+1 −4
Original line number Diff line number Diff line
@@ -90,10 +90,7 @@ struct nf_conntrack_l4proto 
	struct module *me;

};



/* Existing built-in protocols */

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;

/* Existing built-in generic protocol */

extern struct nf_conntrack_l4proto nf_conntrack_l4proto_generic;



#define MAX_NF_CT_PROTO 256

net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <net/netfilter/nf_conntrack_l4proto.h>

#include <net/netfilter/nf_conntrack_l3proto.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,

			      struct nf_conntrack_tuple *tuple)

net/netfilter/nf_conntrack_proto_tcp.c

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ 
#include <net/netfilter/nf_conntrack_l4proto.h>

#include <net/netfilter/nf_conntrack_ecache.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 */

static DEFINE_RWLOCK(tcp_lock);

net/netfilter/nf_conntrack_proto_udp.c

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
#include <net/netfilter/nf_conntrack_l4proto.h>

#include <net/netfilter/nf_conntrack_ecache.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_stream __read_mostly = 180*HZ;