From 28095e18d55d15ba130999fd24656b42869bc731 Mon Sep 17 00:00:00 2001 From: Radu Bulie Date: Mon, 21 Jul 2014 08:04:35 +0000 Subject: dpa_classifier: Add fix for multicast member removal Multicast member with id 0 could not be removed. This constraint was wrong in the context when a new member was added to a multicast group and the user no longer wanted to replicate the frame on member with id 0. This patch fix the above issue. Change-Id: Ia4c86687ef5693936933f7c67ee4c52550227d6d Signed-off-by: Radu Bulie Reviewed-by: Marian Chereji Reviewed-on: http://git.am.freescale.net:8181/14841 diff --git a/drivers/staging/fsl_dpa_offload/dpa_classifier.c b/drivers/staging/fsl_dpa_offload/dpa_classifier.c index f94e2bd..49dad23 100644 --- a/drivers/staging/fsl_dpa_offload/dpa_classifier.c +++ b/drivers/staging/fsl_dpa_offload/dpa_classifier.c @@ -7975,9 +7975,16 @@ int dpa_classif_mcast_remove_member(int grpd, int md) mutex_lock(&pgroup->access); release_desc_table(&mcast_grp_array); - if ((md <= 0) || (md > pgroup->group_params.max_members)) { + if (pgroup->num_members <= 1) { mutex_unlock(&pgroup->access); - log_err("Invalid member descriptor (grpd=%d).\n", md); + log_err("Last member in group cannot be removed (md=%d).\n", + md); + return -EINVAL; + } + + if ((md < 0) || (md > pgroup->group_params.max_members)) { + mutex_unlock(&pgroup->access); + log_err("Invalid member descriptor (md=%d).\n", md); return -EINVAL; } -- cgit v0.10.2