Merge tag 'mlx5-updates-2018-05-17' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / net / bridge / br_forward.c

diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c
index b4eed113d2ec89181e1451244b3a42afeed0e2c8..7a7fd672ccf2a3efbaea2ef464b09db193476b27 100644 (file)
--- a/net/bridge/br_forward.c
+++ b/net/bridge/br_forward.c
@@ -274,8 +274,7 @@ void br_multicast_flood(struct net_bridge_mdb_entry *mdst,
                struct net_bridge_port *port, *lport, *rport;
 
                lport = p ? p->port : NULL;
-               rport = rp ? hlist_entry(rp, struct net_bridge_port, rlist) :
-                            NULL;
+               rport = hlist_entry_safe(rp, struct net_bridge_port, rlist);
 
                if ((unsigned long)lport > (unsigned long)rport) {
                        port = lport;