vserver 1.9.5.x5

[linux-2.6.git] / net / ipv6 / netfilter / ip6t_limit.c

diff --git a/net/ipv6/netfilter/ip6t_limit.c b/net/ipv6/netfilter/ip6t_limit.c
index 4780c3a..fb782f6 100644 (file)
--- a/net/ipv6/netfilter/ip6t_limit.c
+++ b/net/ipv6/netfilter/ip6t_limit.c
@@ -29,7 +29,7 @@ MODULE_DESCRIPTION("rate limiting within ip6tables");
  * see net/sched/sch_tbf.c in the linux source tree
  */
 
-static spinlock_t limit_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(limit_lock);
 
 /* Rusty: This is my (non-mathematically-inclined) understanding of
    this algorithm.  The `average rate' in jiffies becomes your initial
@@ -57,8 +57,7 @@ ip6t_limit_match(const struct sk_buff *skb,
                const struct net_device *out,
                const void *matchinfo,
                int offset,
-               const void *hdr,
-               u_int16_t datalen,
+               unsigned int protoff,
                int *hotdrop)
 {
        struct ip6t_rateinfo *r = ((struct ip6t_rateinfo *)matchinfo)->master;