[netfilter-cvslog] r3307 - in trunk/patch-o-matic-ng/set: . linux-2.6/net/ipv4/netfilter

[kadlec at netfilter.org]

Author: kadlec at netfilter.org
Date: 2004-12-01 14:34:59 +0100 (Wed, 01 Dec 2004)
New Revision: 3307

Modified:
   trunk/patch-o-matic-ng/set/info
   trunk/patch-o-matic-ng/set/linux-2.6/net/ipv4/netfilter/ip_set_macipmap.c
Log:
ip_set_macipmap.c upraded to be compatible with 2.6.9 (JK)


Modified: trunk/patch-o-matic-ng/set/info
===================================================================
--- trunk/patch-o-matic-ng/set/info	2004-12-01 13:20:39 UTC (rev 3306)
+++ trunk/patch-o-matic-ng/set/info	2004-12-01 13:34:59 UTC (rev 3307)
@@ -1,4 +1,5 @@
 Author: Jozsef Kadlecsik <kadlec at blackhole.kfki.hu>
 Status: Beta
 Repository: base
+Requires: linux-2.6 >= 2.6.9
 Recompile: kernel, netfilter, iptables

Modified: trunk/patch-o-matic-ng/set/linux-2.6/net/ipv4/netfilter/ip_set_macipmap.c
===================================================================
--- trunk/patch-o-matic-ng/set/linux-2.6/net/ipv4/netfilter/ip_set_macipmap.c	2004-12-01 13:20:39 UTC (rev 3306)
+++ trunk/patch-o-matic-ng/set/linux-2.6/net/ipv4/netfilter/ip_set_macipmap.c	2004-12-01 13:34:59 UTC (rev 3307)
@@ -85,7 +85,7 @@
 		 * If so, compare... */
 		return (skb->mac.raw >= skb->head
 			&& (skb->mac.raw + ETH_HLEN) <= skb->data
-			&& (memcmp(skb->mac.ethernet->h_source,
+			&& (memcmp(eth_hdr(skb)->h_source,
 				   &table[ip - map->first_ip].ethernet,
 				   ETH_ALEN) == 0));
 	} else {
@@ -144,7 +144,7 @@
 	      && (skb->mac.raw + ETH_HLEN) <= skb->data))
 		return -EINVAL;
 
-	return __addip(set, ip, skb->mac.ethernet->h_source, hash_ip);
+	return __addip(set, ip, eth_hdr(skb)->h_source, hash_ip);
 }
 
 static inline int