[PATCH 2.6 2/6]: Remove skb_linearize in ip6tables

[PATCH 2.6 2/6]: Remove skb_linearize in ip6tables

[Patrick McHardy]

[-- Attachment #1: Type: text/plain, Size: 1 bytes --]



[-- Attachment #2: 02.diff --]
[-- Type: text/x-patch, Size: 1755 bytes --]

# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2005/01/11 03:42:12+01:00 kaber@coreworks.de 
#   [NETFILTER]: Remove skb_linearize in ip6tables
#   
#   Signed-off-by: Patrick McHardy <kaber@trash.net>
# 
# net/ipv6/netfilter/ip6table_mangle.c
#   2005/01/11 03:42:05+01:00 kaber@coreworks.de +0 -4
#   [NETFILTER]: Remove skb_linearize in ip6tables
#   
#   Signed-off-by: Patrick McHardy <kaber@trash.net>
# 
# net/ipv6/netfilter/ip6_tables.c
#   2005/01/11 03:42:05+01:00 kaber@coreworks.de +0 -4
#   [NETFILTER]: Remove skb_linearize in ip6tables
#   
#   Signed-off-by: Patrick McHardy <kaber@trash.net>
# 
diff -Nru a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
--- a/net/ipv6/netfilter/ip6_tables.c	2005-01-11 13:39:42 +01:00
+++ b/net/ipv6/netfilter/ip6_tables.c	2005-01-11 13:39:42 +01:00
@@ -366,10 +366,6 @@
 	void *table_base;
 	struct ip6t_entry *e, *back;
 
-	/* FIXME: Push down to extensions --RR */
-	if (skb_is_nonlinear(*pskb) && skb_linearize(*pskb, GFP_ATOMIC) != 0)
-		return NF_DROP;
-
 	/* Initialization */
 	indev = in ? in->name : nulldevname;
 	outdev = out ? out->name : nulldevname;
diff -Nru a/net/ipv6/netfilter/ip6table_mangle.c b/net/ipv6/netfilter/ip6table_mangle.c
--- a/net/ipv6/netfilter/ip6table_mangle.c	2005-01-11 13:39:42 +01:00
+++ b/net/ipv6/netfilter/ip6table_mangle.c	2005-01-11 13:39:42 +01:00
@@ -165,10 +165,6 @@
 	}
 #endif
 
-	/* FIXME: Push down to extensions --RR */
-	if (skb_is_nonlinear(*pskb) && skb_linearize(*pskb, GFP_ATOMIC) != 0)
-		return NF_DROP;
-
 	/* save source/dest address, nfmark, hoplimit, flowlabel, priority,  */
 	memcpy(&saddr, &(*pskb)->nh.ipv6h->saddr, sizeof(saddr));
 	memcpy(&daddr, &(*pskb)->nh.ipv6h->daddr, sizeof(daddr));