diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-03-09 12:30:12 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-03-09 17:56:07 +0100 |
| commit | e5de75bf88858f5b3ab11e2504b86ec059f03102 (patch) | |
| tree | 9ddfee8bbd6a4d7518e1e660aacba999cb91711b /net/bridge/br_device.c | |
| parent | 7a8d831df5811f49957cc9b7976319973d088c34 (diff) | |
| download | linux-stable-e5de75bf88858f5b3ab11e2504b86ec059f03102.tar.gz linux-stable-e5de75bf88858f5b3ab11e2504b86ec059f03102.tar.bz2 linux-stable-e5de75bf88858f5b3ab11e2504b86ec059f03102.zip | |
netfilter: bridge: move DNAT helper to br_netfilter
Only one caller, there is no need to keep this in a header.
Move it to br_netfilter.c where this belongs to.
Based on patch from Florian Westphal.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/bridge/br_device.c')
| -rw-r--r-- | net/bridge/br_device.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c index ffd379db5938..294cbcc49263 100644 --- a/net/bridge/br_device.c +++ b/net/bridge/br_device.c @@ -36,13 +36,10 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev) u16 vid = 0; rcu_read_lock(); -#if IS_ENABLED(CONFIG_BRIDGE_NETFILTER) - if (skb->nf_bridge && (skb->nf_bridge->mask & BRNF_BRIDGED_DNAT)) { - br_nf_pre_routing_finish_bridge_slow(skb); + if (br_nf_prerouting_finish_bridge(skb)) { rcu_read_unlock(); return NETDEV_TX_OK; } -#endif u64_stats_update_begin(&brstats->syncp); brstats->tx_packets++; |