diff options
| author | Jiri Pirko <jpirko@redhat.com> | 2010-06-15 06:50:45 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-15 11:48:58 -0700 |
| commit | f350a0a87374418635689471606454abc7beaa3a (patch) | |
| tree | c8210542a9848f6b5953b58d2ba1dbfb11715f14 /net/bridge/netfilter/ebt_redirect.c | |
| parent | a35e2c1b6d90544b3c688783869817628e5f9607 (diff) | |
| download | kernel_samsung_smdk4412-f350a0a87374418635689471606454abc7beaa3a.zip kernel_samsung_smdk4412-f350a0a87374418635689471606454abc7beaa3a.tar.gz kernel_samsung_smdk4412-f350a0a87374418635689471606454abc7beaa3a.tar.bz2 | |
bridge: use rx_handler_data pointer to store net_bridge_port pointer
Register net_bridge_port pointer as rx_handler data pointer. As br_port is
removed from struct net_device, another netdev priv_flag is added to indicate
the device serves as a bridge port. Also rcuized pointers are now correctly
dereferenced in br_fdb.c and in netfilter parts.
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/netfilter/ebt_redirect.c')
| -rw-r--r-- | net/bridge/netfilter/ebt_redirect.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/bridge/netfilter/ebt_redirect.c b/net/bridge/netfilter/ebt_redirect.c index 9e19166..46624bb 100644 --- a/net/bridge/netfilter/ebt_redirect.c +++ b/net/bridge/netfilter/ebt_redirect.c @@ -24,8 +24,9 @@ ebt_redirect_tg(struct sk_buff *skb, const struct xt_action_param *par) return EBT_DROP; if (par->hooknum != NF_BR_BROUTING) + /* rcu_read_lock()ed by nf_hook_slow */ memcpy(eth_hdr(skb)->h_dest, - par->in->br_port->br->dev->dev_addr, ETH_ALEN); + br_port_get_rcu(par->in)->br->dev->dev_addr, ETH_ALEN); else memcpy(eth_hdr(skb)->h_dest, par->in->dev_addr, ETH_ALEN); skb->pkt_type = PACKET_HOST; |