summaryrefslogtreecommitdiff
path: root/net/bridge
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-01-09 23:39:11 +0300
committerDavid S. Miller <davem@davemloft.net>2017-01-09 23:39:11 +0300
commitbb1d3034449ed08e2ffbf5813a5ad9fa30475359 (patch)
treea48cc17fc4683b5fdc1656ac71639540bd8852e2 /net/bridge
parent3b647be2bfcd95d6d0feba245ccc3966c73ccc52 (diff)
parent811a919135b980bac8009d042acdccf10dc1ef5e (diff)
downloadlinux-bb1d3034449ed08e2ffbf5813a5ad9fa30475359.tar.xz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/bridge')
-rw-r--r--net/bridge/br_netfilter_hooks.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_netfilter_hooks.c b/net/bridge/br_netfilter_hooks.c
index 8ca6a929bf12..95087e6e8258 100644
--- a/net/bridge/br_netfilter_hooks.c
+++ b/net/bridge/br_netfilter_hooks.c
@@ -399,7 +399,7 @@ bridged_dnat:
br_nf_hook_thresh(NF_BR_PRE_ROUTING,
net, sk, skb, skb->dev,
NULL,
- br_nf_pre_routing_finish);
+ br_nf_pre_routing_finish_bridge);
return 0;
}
ether_addr_copy(eth_hdr(skb)->h_dest, dev->dev_addr);