diff options
| author | David Ahern <dsa@cumulusnetworks.com> | 2016-12-14 20:06:18 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-12-17 16:45:57 +0100 |
| commit | a0f37efa82253994b99623dbf41eea8dd0ba169b (patch) | |
| tree | 0defffc79178cfbf79c84a94fa8acd9504f4086d /drivers | |
| parent | Merge branch 'cls_flower-mask' (diff) | |
| download | linux-a0f37efa82253994b99623dbf41eea8dd0ba169b.tar.xz linux-a0f37efa82253994b99623dbf41eea8dd0ba169b.zip | |
net: vrf: Fix NAT within a VRF
Connection tracking with VRF is broken because the pass through the VRF
device drops the connection tracking info. Removing the call to nf_reset
allows DNAT and MASQUERADE to work across interfaces within a VRF.
Fixes: 73e20b761acf ("net: vrf: Add support for PREROUTING rules on vrf device")
Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/vrf.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c index 3bca24651dc0..015a1321c7dd 100644 --- a/drivers/net/vrf.c +++ b/drivers/net/vrf.c @@ -849,8 +849,6 @@ static struct sk_buff *vrf_rcv_nfhook(u8 pf, unsigned int hook, { struct net *net = dev_net(dev); - nf_reset(skb); - if (NF_HOOK(pf, hook, net, NULL, skb, dev, NULL, vrf_rcv_finish) < 0) skb = NULL; /* kfree_skb(skb) handled by nf code */ |