diff options
author | Radu Bulie <radu.bulie@freescale.com> | 2014-07-21 08:04:35 (GMT) |
---|---|---|
committer | Matthew Weigel <Matthew.Weigel@freescale.com> | 2014-12-11 18:39:25 (GMT) |
commit | 28095e18d55d15ba130999fd24656b42869bc731 (patch) | |
tree | 5c70bd6ca79d87323d208fb9d7a25756a8315661 /drivers/staging | |
parent | e7f4fc129c826f041676c1908118182ad642e05c (diff) | |
download | linux-fsl-qoriq-28095e18d55d15ba130999fd24656b42869bc731.tar.xz |
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 <radu.bulie@freescale.com>
Reviewed-by: Marian Chereji <marian.chereji@freescale.com>
Reviewed-on: http://git.am.freescale.net:8181/14841
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/fsl_dpa_offload/dpa_classifier.c | 11 |
1 files changed, 9 insertions, 2 deletions
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; } |