From: Florian Westphal <fw@strlen.de>
Date: Mon, 6 Feb 2012 12:23:10 +0000 (+0100)
Subject: netfilter: nf_queue: fix queueing of bridged gro skbs
X-Git-Tag: v3.3-rc6~36^2~10^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8db7b2d197a0d624baab83f0c810b0edbc4ffd0;p=pandora-kernel.git

netfilter: nf_queue: fix queueing of bridged gro skbs

When trying to nf_queue GRO/GSO skbs, nf_queue uses skb_gso_segment
to split the skb.

However, if nf_queue is called via bridge netfilter, the mac header
won't be preserved -- packets will thus contain a bogus mac header.

Fix this by setting skb->data to the mac header when skb->nf_bridge
is set and restoring skb->data afterwards for all segments.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

Reading git-diff-tree failed