SOURCES (LINUX_2_6): kernel-pom-ng-ROUTE.patch - updated for 2.6.24

[zbyniu]

Author: zbyniu                       Date: Sun Jan 27 23:48:30 2008 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- updated for 2.6.24

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

---- Diffs:

================================================================
Index: SOURCES/kernel-pom-ng-ROUTE.patch
diff -u SOURCES/kernel-pom-ng-ROUTE.patch:1.1.2.6 SOURCES/kernel-pom-ng-ROUTE.patch:1.1.2.7
--- SOURCES/kernel-pom-ng-ROUTE.patch:1.1.2.6	Fri Jan 18 15:32:47 2008
+++ SOURCES/kernel-pom-ng-ROUTE.patch	Mon Jan 28 00:48:25 2008
@@ -215,7 +215,7 @@
 +	int hh_len = LL_RESERVED_SPACE(dev);
 +
 +	/* Be paranoid, rather than too clever. */
-+	if (unlikely(skb_headroom(skb) < hh_len && dev->hard_header)) {
++	if (unlikely(skb_headroom(skb) < hh_len && dev->header_ops)) {
 +		struct sk_buff *skb2;
 +
 +		skb2 = skb_realloc_headroom(skb, LL_RESERVED_SPACE(dev));
@@ -261,7 +261,7 @@
 +	/* The user set the interface name to use.
 +	 * Getting the current interface index.
 +	 */
-+	if ((dev_out = dev_get_by_name(route_info->oif))) {
++	if ((dev_out = dev_get_by_name(&init_net, route_info->oif))) {
 +		ifindex = dev_out->ifindex;
 +	} else {
 +		/* Unknown interface name : packet dropped */
@@ -327,7 +327,7 @@
 +	struct net_device *dev_in = NULL;
 +
 +	/* Getting the current interface index. */
-+	if (!(dev_in = dev_get_by_name(route_info->iif))) {
++	if (!(dev_in = dev_get_by_name(&init_net, route_info->iif))) {
 +		if (net_ratelimit()) 
 +			DEBUGP("ipt_ROUTE: iif interface %s not found\n", route_info->iif);
 +		return NF_DROP;
@@ -730,7 +730,7 @@
 +	/* The user set the interface name to use.
 +	 * Getting the current interface index.
 +	 */
-+	if ((dev_out = dev_get_by_name(route_info->oif))) {
++	if ((dev_out = dev_get_by_name(&init_net, route_info->oif))) {
 +		ifindex = dev_out->ifindex;
 +	} else {
 +		/* Unknown interface name : packet dropped */
================================================================

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