SOURCES (LINUX_2_6): kernel-pom-ng-set.patch - s/skb->mac.raw/skb-...

zbyniu zbyniu at pld-linux.org
Mon Aug 13 16:08:02 CEST 2007


Author: zbyniu                       Date: Mon Aug 13 14:08:02 2007 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- s/skb->mac.raw/skb->mac_header/

---- Files affected:
SOURCES:
   kernel-pom-ng-set.patch (1.1.2.6 -> 1.1.2.7) 

---- Diffs:

================================================================
Index: SOURCES/kernel-pom-ng-set.patch
diff -u SOURCES/kernel-pom-ng-set.patch:1.1.2.6 SOURCES/kernel-pom-ng-set.patch:1.1.2.7
--- SOURCES/kernel-pom-ng-set.patch:1.1.2.6	Mon Aug 13 16:00:44 2007
+++ SOURCES/kernel-pom-ng-set.patch	Mon Aug 13 16:07:57 2007
@@ -5062,8 +5062,8 @@
 +	    (void *) &table[ip - map->first_ip].flags)) {
 +		/* Is mac pointer valid?
 +		 * If so, compare... */
-+		return (skb->mac.raw >= skb->head
-+			&& (skb->mac.raw + ETH_HLEN) <= skb->data
++		return (skb->mac_header >= skb->head
++			&& (skb->mac_header + ETH_HLEN) <= skb->data
 +			&& (memcmp(eth_hdr(skb)->h_source,
 +				   &table[ip - map->first_ip].ethernet,
 +				   ETH_ALEN) == 0));
@@ -5123,8 +5123,8 @@
 +			? ip_hdr(skb)->saddr
 +			: ip_hdr(skb)->daddr);
 +
-+	if (!(skb->mac.raw >= skb->head
-+	      && (skb->mac.raw + ETH_HLEN) <= skb->data))
++	if (!(skb->mac_header >= skb->head
++	      && (skb->mac_header + ETH_HLEN) <= skb->data))
 +		return -EINVAL;
 +
 +	return __addip(set, ip, eth_hdr(skb)->h_source, hash_ip);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kernel-pom-ng-set.patch?r1=1.1.2.6&r2=1.1.2.7&f=u



More information about the pld-cvs-commit mailing list