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/br_stp_bpdu.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/br_stp_bpdu.c')
| -rw-r--r-- | net/bridge/br_stp_bpdu.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/bridge/br_stp_bpdu.c b/net/bridge/br_stp_bpdu.c index 217bd22..70aecb4 100644 --- a/net/bridge/br_stp_bpdu.c +++ b/net/bridge/br_stp_bpdu.c @@ -137,12 +137,13 @@ void br_stp_rcv(const struct stp_proto *proto, struct sk_buff *skb, struct net_device *dev) { const unsigned char *dest = eth_hdr(skb)->h_dest; - struct net_bridge_port *p = rcu_dereference(dev->br_port); + struct net_bridge_port *p; struct net_bridge *br; const unsigned char *buf; - if (!p) + if (!br_port_exists(dev)) goto err; + p = br_port_get_rcu(dev); if (!pskb_may_pull(skb, 4)) goto err; |