aboutsummaryrefslogtreecommitdiffstats
path: root/net/bridge
diff options
context:
space:
mode:
Diffstat (limited to 'net/bridge')
-rw-r--r--net/bridge/br_netlink.c2
-rw-r--r--net/bridge/br_private.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index 743511bb7319..14b065cbd214 100644
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -166,8 +166,6 @@ int br_setlink(struct net_device *dev, struct nlmsghdr *nlh)
166 br_port_state_selection(p->br); 166 br_port_state_selection(p->br);
167 spin_unlock_bh(&p->br->lock); 167 spin_unlock_bh(&p->br->lock);
168 168
169 br_ifinfo_notify(RTM_NEWLINK, p);
170
171 return 0; 169 return 0;
172} 170}
173 171
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index fdcd5f626ca6..6f40c14a2a65 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -158,7 +158,9 @@ struct net_bridge_port
158 158
159static inline struct net_bridge_port *br_port_get_rcu(const struct net_device *dev) 159static inline struct net_bridge_port *br_port_get_rcu(const struct net_device *dev)
160{ 160{
161 struct net_bridge_port *port = rcu_dereference(dev->rx_handler_data); 161 struct net_bridge_port *port =
162 rcu_dereference_rtnl(dev->rx_handler_data);
163
162 return br_port_exists(dev) ? port : NULL; 164 return br_port_exists(dev) ? port : NULL;
163} 165}
164 166