netfilter-2.6/patch-o-matic-ng/trunk/net: ipv4/netfilter/ipt_hashlimit.c ipv6/netfilter/ip6t_REJECT....

[pluto]

Author: pluto
Date: Wed Jun 22 14:08:50 2005
New Revision: 6161

Modified:
   netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ipt_hashlimit.c
   netfilter-2.6/patch-o-matic-ng/trunk/net/ipv6/netfilter/ip6t_REJECT.c
Log:
- typo in hashlimit fixed, ip6t_REJECT fixed.


Modified: netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ipt_hashlimit.c
==============================================================================
--- netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ipt_hashlimit.c	(original)
+++ netfilter-2.6/patch-o-matic-ng/trunk/net/ipv4/netfilter/ipt_hashlimit.c	Wed Jun 22 14:08:50 2005
@@ -91,7 +91,7 @@
 	struct hlist_head hash[0];	/* hashtable itself */
 };
 
-static DECLARE_LOCK(hashlimt_lock);	/* protects htables list */
+static DECLARE_LOCK(hashlimit_lock);	/* protects htables list */
 static DECLARE_MUTEX(hlimit_mutex);	/* additional checkentry protection */
 static HLIST_HEAD(hashlimit_htables);
 static kmem_cache_t *hashlimit_cachep;

Modified: netfilter-2.6/patch-o-matic-ng/trunk/net/ipv6/netfilter/ip6t_REJECT.c
==============================================================================
--- netfilter-2.6/patch-o-matic-ng/trunk/net/ipv6/netfilter/ip6t_REJECT.c	(original)
+++ netfilter-2.6/patch-o-matic-ng/trunk/net/ipv6/netfilter/ip6t_REJECT.c	Wed Jun 22 14:08:50 2005
@@ -72,9 +72,7 @@
 	}
 
 	proto = oip6h->nexthdr;
-	tcphoff = ipv6_skip_exthdr(oldskb, ((u8*)(oip6h+1) - oldskb->data),
-				   &proto, oldskb->len - ((u8*)(oip6h+1)
-							  - oldskb->data));
+	tcphoff = ipv6_skip_exthdr(oldskb, (u8*)(oip6h+1) - oldskb->data, &proto);
 
 	if ((tcphoff < 0) || (tcphoff > oldskb->len)) {
 		DEBUGP("ip6t_REJECT: Can't get TCP header.\n");