Patchwork [00/32] Swap over NFS - v19

login
register
mail settings
Submitter Suresh Jayaraman
Date Oct. 6, 2008, 6:04 a.m.
Message ID <48E9AA6E.3080608@suse.de>
Download mbox | patch
Permalink /patch/2871/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

Suresh Jayaraman - Oct. 6, 2008, 6:04 a.m.
Peter Zijlstra wrote:
> Patches are against: v2.6.27-rc5-mm1
> 
> This release features more comments and (hopefully) better Changelogs.
> Also the netns stuff got sorted and ipv6 will now build 

Except for this one I think ;-)

net/netfilter/core.c: In function ‘nf_hook_slow’:
net/netfilter/core.c:191: error: ‘pskb’ undeclared (first use in this
function)

> and not oops on boot ;-)

The culprit is emergency-nf_queue.patch. The following change fixes the
build error for me.



Thanks,

Patch

Index: linux-2.6.26/net/netfilter/core.c
===================================================================
--- linux-2.6.26.orig/net/netfilter/core.c
+++ linux-2.6.26/net/netfilter/core.c
@@ -184,9 +184,12 @@  next_hook:
                ret = 1;
                goto unlock;
        } else if (verdict == NF_DROP) {
+drop:
                kfree_skb(skb);
                ret = -EPERM;
        } else if ((verdict & NF_VERDICT_MASK) == NF_QUEUE) {
+               if (skb_emergency(skb))
+                       goto drop;
                if (!nf_queue(skb, elem, pf, hook, indev, outdev, okfn,
                              verdict >> NF_VERDICT_BITS))
                        goto next_hook;