git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
net
/
netfilter
/
nf_conntrack_l3proto_generic.c
diff --git
a/net/netfilter/nf_conntrack_l3proto_generic.c
b/net/netfilter/nf_conntrack_l3proto_generic.c
index
7de4f06
..
a3d31c3
100644
(file)
--- a/
net/netfilter/nf_conntrack_l3proto_generic.c
+++ b/
net/netfilter/nf_conntrack_l3proto_generic.c
@@
-15,7
+15,6
@@
* Yasuyuki Kozakai @USAGI <yasuyuki.kozakai@toshiba.co.jp>
*/
* Yasuyuki Kozakai @USAGI <yasuyuki.kozakai@toshiba.co.jp>
*/
-#include <linux/config.h>
#include <linux/types.h>
#include <linux/ip.h>
#include <linux/netfilter.h>
#include <linux/types.h>
#include <linux/ip.h>
#include <linux/netfilter.h>
@@
-27,7
+26,7
@@
#include <linux/netfilter_ipv4.h>
#include <net/netfilter/nf_conntrack.h>
#include <linux/netfilter_ipv4.h>
#include <net/netfilter/nf_conntrack.h>
-#include <net/netfilter/nf_conntrack_
protocol
.h>
+#include <net/netfilter/nf_conntrack_
l4proto
.h>
#include <net/netfilter/nf_conntrack_l3proto.h>
#include <net/netfilter/nf_conntrack_core.h>
#include <net/netfilter/ipv4/nf_conntrack_ipv4.h>
#include <net/netfilter/nf_conntrack_l3proto.h>
#include <net/netfilter/nf_conntrack_core.h>
#include <net/netfilter/ipv4/nf_conntrack_ipv4.h>
@@
-38,8
+37,6
@@
#define DEBUGP(format, args...)
#endif
#define DEBUGP(format, args...)
#endif
-DECLARE_PER_CPU(struct nf_conntrack_stat, nf_conntrack_stat);
-
static int generic_pkt_to_tuple(const struct sk_buff *skb, unsigned int nhoff,
struct nf_conntrack_tuple *tuple)
{
static int generic_pkt_to_tuple(const struct sk_buff *skb, unsigned int nhoff,
struct nf_conntrack_tuple *tuple)
{
@@
-85,7
+82,7
@@
static u_int32_t generic_get_features(const struct nf_conntrack_tuple *tuple)
return NF_CT_F_BASIC;
}
return NF_CT_F_BASIC;
}
-struct nf_conntrack_l3proto nf_conntrack_
generic_l3proto
= {
+struct nf_conntrack_l3proto nf_conntrack_
l3proto_generic
= {
.l3proto = PF_UNSPEC,
.name = "unknown",
.pkt_to_tuple = generic_pkt_to_tuple,
.l3proto = PF_UNSPEC,
.name = "unknown",
.pkt_to_tuple = generic_pkt_to_tuple,
@@
-94,5
+91,5
@@
struct nf_conntrack_l3proto nf_conntrack_generic_l3proto = {
.print_conntrack = generic_print_conntrack,
.prepare = generic_prepare,
.get_features = generic_get_features,
.print_conntrack = generic_print_conntrack,
.prepare = generic_prepare,
.get_features = generic_get_features,
- .me = THIS_MODULE,
};
};
+EXPORT_SYMBOL_GPL(nf_conntrack_l3proto_generic);