From: David S. Miller <davem@davemloft.net>
Date: Tue, 13 Oct 2015 02:44:22 +0000 (-0700)
Subject: Merge branch 'netns-defrag'
X-Git-Tag: KARO-TX6UL-2015-11-03~90^2~122
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=b7a4609591612119869f2498732da98e4f8d5f4d;hp=-c;p=karo-tx-linux.git

Merge branch 'netns-defrag'

Eric W. Biederman says:

====================
net: Pass net into defragmentation

This is the next installment of my work to pass struct net through the
output path so the code does not need to guess how to figure out which
network namespace it is in, and ultimately routes can have output
devices in another network namespace.

In netfilter and af_packet we defragment packets in the output path,
and there is the usual amount of confusion about how to compute which
net we are processing the packets in.  This patchset clears that
confusion up by explicitly passing in struct net in ip_defrag,
ip_check_defrag, and nf_ct_frag6_gather.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

b7a4609591612119869f2498732da98e4f8d5f4d