* [PATCH 2.6.11 PKT_SCHED]: ipt action: add back pskb_expand_head call
@ 2005-02-04 3:10 Patrick McHardy
2005-02-04 4:09 ` Patrick McHardy
2005-02-07 6:04 ` David S. Miller
0 siblings, 2 replies; 3+ messages in thread
From: Patrick McHardy @ 2005-02-04 3:10 UTC (permalink / raw)
To: David S. Miller; +Cc: Maillist netdev
[-- 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;
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 2.6.11 PKT_SCHED]: ipt action: add back pskb_expand_head call
2005-02-04 3:10 [PATCH 2.6.11 PKT_SCHED]: ipt action: add back pskb_expand_head call Patrick McHardy
@ 2005-02-04 4:09 ` Patrick McHardy
2005-02-07 6:04 ` David S. Miller
1 sibling, 0 replies; 3+ messages in thread
From: Patrick McHardy @ 2005-02-04 4:09 UTC (permalink / raw)
To: David S. Miller; +Cc: Maillist netdev
Patrick McHardy wrote:
> 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.
I forgot the Signed-off-by line, sorry:
Signed-off-by: Patrick McHardy <kaber@trash.net>
>------------------------------------------------------------------------
>
>===== 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;
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 2.6.11 PKT_SCHED]: ipt action: add back pskb_expand_head call
2005-02-04 3:10 [PATCH 2.6.11 PKT_SCHED]: ipt action: add back pskb_expand_head call Patrick McHardy
2005-02-04 4:09 ` Patrick McHardy
@ 2005-02-07 6:04 ` David S. Miller
1 sibling, 0 replies; 3+ messages in thread
From: David S. Miller @ 2005-02-07 6:04 UTC (permalink / raw)
To: Patrick McHardy; +Cc: netdev
On Fri, 04 Feb 2005 04:10:54 +0100
Patrick McHardy <kaber@trash.net> wrote:
> 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.
Applied, thanks Patrick.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2005-02-07 6:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-02-04 3:10 [PATCH 2.6.11 PKT_SCHED]: ipt action: add back pskb_expand_head call Patrick McHardy
2005-02-04 4:09 ` Patrick McHardy
2005-02-07 6:04 ` David S. Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).