Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 9d2493f88f846b391a15a736efc7f4b97d6c4046

Authored by Christoph Paasch
Committed by Patrick McHardy
1 parent c7a913cd55

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>

Showing 4 changed files with 6 additions and 4 deletions Side-by-side Diff

include/net/netfilter/nf_conntrack_l4proto.h
Diff comments   View file @ 9d2493f
... ... @@ -90,10 +90,7 @@
90 90 struct module *me;
91 91 };
92 92  
93   -/* Existing built-in protocols */
94   -extern struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp6;
95   -extern struct nf_conntrack_l4proto nf_conntrack_l4proto_udp4;
96   -extern struct nf_conntrack_l4proto nf_conntrack_l4proto_udp6;
  93 +/* Existing built-in generic protocol */
97 94 extern struct nf_conntrack_l4proto nf_conntrack_l4proto_generic;
98 95  
99 96 #define MAX_NF_CT_PROTO 256
net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c
Diff comments   View file @ 9d2493f
... ... @@ -26,6 +26,7 @@
26 26 #include <net/netfilter/nf_conntrack_l4proto.h>
27 27 #include <net/netfilter/nf_conntrack_l3proto.h>
28 28 #include <net/netfilter/nf_conntrack_core.h>
  29 +#include <net/netfilter/ipv6/nf_conntrack_ipv6.h>
29 30  
30 31 static bool ipv6_pkt_to_tuple(const struct sk_buff *skb, unsigned int nhoff,
31 32 struct nf_conntrack_tuple *tuple)
net/netfilter/nf_conntrack_proto_tcp.c
Diff comments   View file @ 9d2493f
... ... @@ -25,6 +25,8 @@
25 25 #include <net/netfilter/nf_conntrack_l4proto.h>
26 26 #include <net/netfilter/nf_conntrack_ecache.h>
27 27 #include <net/netfilter/nf_log.h>
  28 +#include <net/netfilter/ipv4/nf_conntrack_ipv4.h>
  29 +#include <net/netfilter/ipv6/nf_conntrack_ipv6.h>
28 30  
29 31 /* Protects ct->proto.tcp */
30 32 static DEFINE_RWLOCK(tcp_lock);
net/netfilter/nf_conntrack_proto_udp.c
Diff comments   View file @ 9d2493f
... ... @@ -22,6 +22,8 @@
22 22 #include <net/netfilter/nf_conntrack_l4proto.h>
23 23 #include <net/netfilter/nf_conntrack_ecache.h>
24 24 #include <net/netfilter/nf_log.h>
  25 +#include <net/netfilter/ipv4/nf_conntrack_ipv4.h>
  26 +#include <net/netfilter/ipv6/nf_conntrack_ipv6.h>
25 27  
26 28 static unsigned int nf_ct_udp_timeout __read_mostly = 30*HZ;
27 29 static unsigned int nf_ct_udp_timeout_stream __read_mostly = 180*HZ;