projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/spi-2.6
[powerpc.git]
/
net
/
ipv4
/
netfilter
/
ip_conntrack_proto_generic.c
diff --git
a/net/ipv4/netfilter/ip_conntrack_proto_generic.c
b/net/ipv4/netfilter/ip_conntrack_proto_generic.c
index
88c3712
..
f891308
100644
(file)
--- a/
net/ipv4/netfilter/ip_conntrack_proto_generic.c
+++ b/
net/ipv4/netfilter/ip_conntrack_proto_generic.c
@@
-12,7
+12,7
@@
#include <linux/netfilter.h>
#include <linux/netfilter_ipv4/ip_conntrack_protocol.h>
#include <linux/netfilter.h>
#include <linux/netfilter_ipv4/ip_conntrack_protocol.h>
-unsigned
long
ip_ct_generic_timeout = 600*HZ;
+unsigned
int
ip_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,