projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
[powerpc.git]
/
net
/
netfilter
/
nf_conntrack_proto_generic.c
diff --git
a/net/netfilter/nf_conntrack_proto_generic.c
b/net/netfilter/nf_conntrack_proto_generic.c
index
36425f6
..
46bc27e
100644
(file)
--- a/
net/netfilter/nf_conntrack_proto_generic.c
+++ b/
net/netfilter/nf_conntrack_proto_generic.c
@@
-17,7
+17,7
@@
#include <linux/netfilter.h>
#include <net/netfilter/nf_conntrack_protocol.h>
#include <linux/netfilter.h>
#include <net/netfilter/nf_conntrack_protocol.h>
-unsigned
long
nf_ct_generic_timeout = 600*HZ;
+unsigned
int
nf_ct_generic_timeout = 600*HZ;
static int generic_pkt_to_tuple(const struct sk_buff *skb,
unsigned int dataoff,
static int generic_pkt_to_tuple(const struct sk_buff *skb,
unsigned int dataoff,