diff options
| author |  Pablo Neira Ayuso <pablo@netfilter.org>
| 2016-11-03 10:56:21 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org>
| 2016-11-03 10:56:21 +0100 |
| commit | 613dbd95723aee7abd16860745691b6c7bda20dc (patch) | |
| tree | 51b5f91d3ac78dc092a1451597ccf0dd0c600764 /net/bridge/netfilter/ebt_redirect.c | |
| parent | netfilter: deprecate NF_STOP (diff) | |
| download | linux-613dbd95723aee7abd16860745691b6c7bda20dc.tar.gz linux-613dbd95723aee7abd16860745691b6c7bda20dc.tar.bz2 linux-613dbd95723aee7abd16860745691b6c7bda20dc.zip | |
netfilter: x_tables: move hook state into xt_action_param structure
Place pointer to hook state in xt_action_param structure instead of
copying the fields that we need. After this change xt_action_param fits
into one cacheline.
This patch also adds a set of new wrapper functions to fetch relevant
hook state structure fields.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/bridge/netfilter/ebt_redirect.c')
| -rw-r--r-- | net/bridge/netfilter/ebt_redirect.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/bridge/netfilter/ebt_redirect.c b/net/bridge/netfilter/ebt_redirect.c index 2e7c4f974340..8d2a85e0594e 100644 --- a/net/bridge/netfilter/ebt_redirect.c +++ b/net/bridge/netfilter/ebt_redirect.c @@ -23,12 +23,12 @@ ebt_redirect_tg(struct sk_buff *skb, const struct xt_action_param *par) if (!skb_make_writable(skb, 0)) return EBT_DROP; - if (par->hooknum != NF_BR_BROUTING) + if (xt_hooknum(par) != NF_BR_BROUTING) /* rcu_read_lock()ed by nf_hook_thresh */ ether_addr_copy(eth_hdr(skb)->h_dest, - br_port_get_rcu(par->in)->br->dev->dev_addr); + br_port_get_rcu(xt_in(par))->br->dev->dev_addr); else - ether_addr_copy(eth_hdr(skb)->h_dest, par->in->dev_addr); + ether_addr_copy(eth_hdr(skb)->h_dest, xt_in(par)->dev_addr); skb->pkt_type = PACKET_HOST; return info->target; } |