diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-03-09 07:30:12 -0400 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-03-09 12:56:07 -0400 |
| commit | e5de75bf88858f5b3ab11e2504b86ec059f03102 (patch) | |
| tree | 9ddfee8bbd6a4d7518e1e660aacba999cb91711b /include/linux | |
| parent | 7a8d831df5811f49957cc9b7976319973d088c34 (diff) | |
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 'include/linux')
| -rw-r--r-- | include/linux/netfilter_bridge.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/include/linux/netfilter_bridge.h b/include/linux/netfilter_bridge.h index dd580a9a1add..bb39113ea596 100644 --- a/include/linux/netfilter_bridge.h +++ b/include/linux/netfilter_bridge.h | |||
| @@ -44,18 +44,6 @@ static inline unsigned int nf_bridge_mtu_reduction(const struct sk_buff *skb) | |||
| 44 | } | 44 | } |
| 45 | 45 | ||
| 46 | int br_handle_frame_finish(struct sk_buff *skb); | 46 | int br_handle_frame_finish(struct sk_buff *skb); |
| 47 | /* Only used in br_device.c */ | ||
| 48 | static inline int br_nf_pre_routing_finish_bridge_slow(struct sk_buff *skb) | ||
| 49 | { | ||
| 50 | struct nf_bridge_info *nf_bridge = skb->nf_bridge; | ||
| 51 | |||
| 52 | skb_pull(skb, ETH_HLEN); | ||
| 53 | nf_bridge->mask ^= BRNF_BRIDGED_DNAT; | ||
| 54 | skb_copy_to_linear_data_offset(skb, -(ETH_HLEN-ETH_ALEN), | ||
| 55 | skb->nf_bridge->data, ETH_HLEN-ETH_ALEN); | ||
| 56 | skb->dev = nf_bridge->physindev; | ||
| 57 | return br_handle_frame_finish(skb); | ||
| 58 | } | ||
| 59 | 47 | ||
| 60 | /* This is called by the IP fragmenting code and it ensures there is | 48 | /* This is called by the IP fragmenting code and it ensures there is |
| 61 | * enough room for the encapsulating header (if there is one). */ | 49 | * enough room for the encapsulating header (if there is one). */ |
