diff options
| author |   David S. Miller <davem@davemloft.net> | 2015-04-03 20:32:56 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-04-04 12:31:38 -0400 |
| commit | 238e54c9cb9385a1ba99e92801f3615a2fb398b6 (patch) | |
| tree | 4efeb9b5c92f87028a6d321c7088b9d1e270360a /net/bridge/netfilter/nf_tables_bridge.c | |
| parent | netfilter: Use nf_hook_state in nf_queue_entry. (diff) | |
| download | linux-dev-238e54c9cb9385a1ba99e92801f3615a2fb398b6.tar.xz linux-dev-238e54c9cb9385a1ba99e92801f3615a2fb398b6.zip | |
netfilter: Make nf_hookfn use nf_hook_state.
Pass the nf_hook_state all the way down into the hook
functions themselves.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/netfilter/nf_tables_bridge.c')
| -rw-r--r-- | net/bridge/netfilter/nf_tables_bridge.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/net/bridge/netfilter/nf_tables_bridge.c b/net/bridge/netfilter/nf_tables_bridge.c index 19473a9371b8..2c46a47160a8 100644 --- a/net/bridge/netfilter/nf_tables_bridge.c +++ b/net/bridge/netfilter/nf_tables_bridge.c @@ -93,21 +93,19 @@ static inline void nft_bridge_set_pktinfo_ipv6(struct nft_pktinfo *pkt, static unsigned int nft_do_chain_bridge(const struct nf_hook_ops *ops, struct sk_buff *skb, - const struct net_device *in, - const struct net_device *out, - int (*okfn)(struct sk_buff *)) + const struct nf_hook_state *state) { struct nft_pktinfo pkt; switch (eth_hdr(skb)->h_proto) { case htons(ETH_P_IP): - nft_bridge_set_pktinfo_ipv4(&pkt, ops, skb, in, out); + nft_bridge_set_pktinfo_ipv4(&pkt, ops, skb, state->in, state->out); break; case htons(ETH_P_IPV6): - nft_bridge_set_pktinfo_ipv6(&pkt, ops, skb, in, out); + nft_bridge_set_pktinfo_ipv6(&pkt, ops, skb, state->in, state->out); break; default: - nft_set_pktinfo(&pkt, ops, skb, in, out); + nft_set_pktinfo(&pkt, ops, skb, state->in, state->out); break; } |