diff options
author | Florian Westphal <fw@strlen.de> | 2015-03-10 05:08:19 +0100 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-03-16 14:34:34 +0100 |
commit | c055d5b03bb4cb69d349d787c9787c0383abd8b2 (patch) | |
tree | 92cd93d6fc0c8f0cad4e43afafe880e594124536 /include/linux/netfilter_bridge.h | |
parent | 169bf9121b19dd6029e0a354d33513f61bfbe3d3 (diff) | |
download | linux-stable-c055d5b03bb4cb69d349d787c9787c0383abd8b2.tar.gz linux-stable-c055d5b03bb4cb69d349d787c9787c0383abd8b2.tar.bz2 linux-stable-c055d5b03bb4cb69d349d787c9787c0383abd8b2.zip |
netfilter: bridge: query conntrack about skb dnat
ask conntrack instead of storing ipv4 address in nf_bridge_info->data.
Ths avoids the need to use ->data during NF_PRE_ROUTING.
Only two functions that need ->data remain.
These will be addressed in followup patches.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include/linux/netfilter_bridge.h')
-rw-r--r-- | include/linux/netfilter_bridge.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/linux/netfilter_bridge.h b/include/linux/netfilter_bridge.h index bb39113ea596..de123d769ffc 100644 --- a/include/linux/netfilter_bridge.h +++ b/include/linux/netfilter_bridge.h @@ -54,12 +54,6 @@ static inline unsigned int nf_bridge_pad(const struct sk_buff *skb) return 0; } -struct bridge_skb_cb { - union { - __be32 ipv4; - } daddr; -}; - static inline void br_drop_fake_rtable(struct sk_buff *skb) { struct dst_entry *dst = skb_dst(skb); |