diff --git a/[refs] b/[refs] index b1eb38a23681..06f5308dc7de 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e80c124485b73146deadce14fd4da2054581806 +refs/heads/master: 168d40ee3d147ae20860e7916bd79b636cbe8fd5 diff --git a/trunk/net/bridge/br_forward.c b/trunk/net/bridge/br_forward.c index 7a241c396981..5b70fc012e40 100644 --- a/trunk/net/bridge/br_forward.c +++ b/trunk/net/bridge/br_forward.c @@ -216,7 +216,7 @@ static void br_multicast_flood(struct net_bridge_mdb_entry *mdst, prev = NULL; - rp = br->router_list.first; + rp = rcu_dereference(br->router_list.first); p = mdst ? mdst->ports : NULL; while (p || rp) { lport = p ? p->port : NULL; @@ -233,7 +233,7 @@ static void br_multicast_flood(struct net_bridge_mdb_entry *mdst, if ((unsigned long)lport >= (unsigned long)port) p = p->next; if ((unsigned long)rport >= (unsigned long)port) - rp = rp->next; + rp = rcu_dereference(rp->next); } if (!prev)