X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=net%2Fbridge%2Fbr_forward.c;h=7a7fd672ccf2a3efbaea2ef464b09db193476b27;hb=260ab7042e24ccd4407985c6e775e39d064fab2b;hp=b4eed113d2ec89181e1451244b3a42afeed0e2c8;hpb=f8940a0f20ebf3f1fb81008a6a9b287b65a85a92;p=sfrench%2Fcifs-2.6.git

diff --git a/net/bridge/br_forward.c b/net/bridge/br_forward.c
index b4eed113d2ec..7a7fd672ccf2 100644
--- 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;