X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=blobdiff_plain;f=net%2Fcore%2Fneighbour.c;fp=net%2Fcore%2Fneighbour.c;h=9500d28a43b0e1a390382912b6fb59db935e727b;hp=8e39e28b0a8dd8965c865cfc6d96522904b19a53;hb=8cf8821e15cd553339a5b48ee555a0439c2b2742;hpb=2b5668733050fca85f0ab458c5b91732f9496a38

diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index 8e39e28b0a8d..9500d28a43b0 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -235,6 +235,8 @@ static int neigh_forced_gc(struct neigh_table *tbl)
 
 			write_lock(&n->lock);
 			if ((n->nud_state == NUD_FAILED) ||
+			    (tbl->is_multicast &&
+			     tbl->is_multicast(n->primary_key)) ||
 			    time_after(tref, n->updated))
 				remove = true;
 			write_unlock(&n->lock);