From 987e1acb1748b54f7b65630d4b04e76e4f2ee8ff Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Mon, 12 Jan 2009 00:06:07 +0000 Subject: [PATCH] --- yaml --- r: 129719 b: refs/heads/master c: 71320afcdb33b3f0b754ba1fac6a8c77aa469041 h: refs/heads/master i: 129717: 9ee2e21acedcaa941333925d9c01e07429713a94 129715: 3ccb255a7f5445661873a25a6fc383bfe365bc58 129711: 80942f7fb985b4762c13a17c7e09226b798ce086 v: v3 --- [refs] | 2 +- trunk/net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 2 +- trunk/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0d96fa949537..7cbfcdb227cc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d61ba9fd55b52a10b8e0ffd39bbc33587d3bfc8d +refs/heads/master: 71320afcdb33b3f0b754ba1fac6a8c77aa469041 diff --git a/trunk/net/ipv4/netfilter/nf_conntrack_proto_icmp.c b/trunk/net/ipv4/netfilter/nf_conntrack_proto_icmp.c index 1fd3ef7718b6..2a8bee26f43d 100644 --- a/trunk/net/ipv4/netfilter/nf_conntrack_proto_icmp.c +++ b/trunk/net/ipv4/netfilter/nf_conntrack_proto_icmp.c @@ -20,7 +20,7 @@ #include #include -static unsigned long nf_ct_icmp_timeout __read_mostly = 30*HZ; +static unsigned int nf_ct_icmp_timeout __read_mostly = 30*HZ; static bool icmp_pkt_to_tuple(const struct sk_buff *skb, unsigned int dataoff, struct nf_conntrack_tuple *tuple) diff --git a/trunk/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c b/trunk/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c index bd52151d31e9..c455cf4ee756 100644 --- a/trunk/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c +++ b/trunk/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c @@ -26,7 +26,7 @@ #include #include -static unsigned long nf_ct_icmpv6_timeout __read_mostly = 30*HZ; +static unsigned int nf_ct_icmpv6_timeout __read_mostly = 30*HZ; static bool icmpv6_pkt_to_tuple(const struct sk_buff *skb, unsigned int dataoff,