diff options
Diffstat (limited to 'net/bridge/br_private.h')
-rw-r--r-- | net/bridge/br_private.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index 22915c8e9961..799dbb37e5a2 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h | |||
@@ -388,7 +388,7 @@ extern void br_fdb_update(struct net_bridge *br, | |||
388 | const unsigned char *addr, | 388 | const unsigned char *addr, |
389 | u16 vid); | 389 | u16 vid); |
390 | 390 | ||
391 | extern int br_fdb_delete(struct ndmsg *ndm, | 391 | extern int br_fdb_delete(struct ndmsg *ndm, struct nlattr *tb[], |
392 | struct net_device *dev, | 392 | struct net_device *dev, |
393 | const unsigned char *addr); | 393 | const unsigned char *addr); |
394 | extern int br_fdb_add(struct ndmsg *nlh, struct nlattr *tb[], | 394 | extern int br_fdb_add(struct ndmsg *nlh, struct nlattr *tb[], |
@@ -577,13 +577,13 @@ extern void nbp_vlan_flush(struct net_bridge_port *port); | |||
577 | static inline struct net_port_vlans *br_get_vlan_info( | 577 | static inline struct net_port_vlans *br_get_vlan_info( |
578 | const struct net_bridge *br) | 578 | const struct net_bridge *br) |
579 | { | 579 | { |
580 | return rcu_dereference(br->vlan_info); | 580 | return rcu_dereference_rtnl(br->vlan_info); |
581 | } | 581 | } |
582 | 582 | ||
583 | static inline struct net_port_vlans *nbp_get_vlan_info( | 583 | static inline struct net_port_vlans *nbp_get_vlan_info( |
584 | const struct net_bridge_port *p) | 584 | const struct net_bridge_port *p) |
585 | { | 585 | { |
586 | return rcu_dereference(p->vlan_info); | 586 | return rcu_dereference_rtnl(p->vlan_info); |
587 | } | 587 | } |
588 | 588 | ||
589 | /* Since bridge now depends on 8021Q module, but the time bridge sees the | 589 | /* Since bridge now depends on 8021Q module, but the time bridge sees the |