[PATCH 2.6.11 PKT_SCHED]: ipt action: add back pskb_expand_head call

[Patrick McHardy <kaber@trash.net>]

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

Hi Dave,

Jamal asked me to add back the call to pskb_expand_head before 2.6.11.
This fixes a regression caused by my tc action cleanup patches, the
tc actions most not replace packets, so it must prevent netfilter from
doing so.

Regards
Patrick


[-- Attachment #2: x --]
[-- Type: text/plain, Size: 396 bytes --]

===== net/sched/ipt.c 1.13 vs edited =====
--- 1.13/net/sched/ipt.c	2005-01-14 05:41:07 +01:00
+++ edited/net/sched/ipt.c	2005-02-04 04:06:45 +01:00
@@ -207,6 +207,11 @@
 	struct tcf_ipt *p = PRIV(a, ipt);
 	struct sk_buff *skb = *pskb;
 
+	if (skb_cloned(skb)) {
+		if (pskb_expand_head(skb, 0, 0, GFP_ATOMIC))
+			return TC_ACT_UNSPEC;
+	}
+
 	spin_lock(&p->lock);
 
 	p->tm.lastuse = jiffies;