summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet
diff options
context:
space:
mode:
authorMadalin Bucur <madalin.bucur@freescale.com>2015-01-15 12:07:45 (GMT)
committerMadalin Bucur <madalin.bucur@freescale.com>2015-02-25 16:27:02 (GMT)
commita648aa60a34dd2ab5dbfbe691bdbf1cd5253dcdd (patch)
treea7a67296366b3f87d547880adeb933b3aa61d62e /drivers/net/ethernet
parenta8da1190b22c97a1464c112392799fba30865dea (diff)
downloadlinux-fsl-qoriq-a648aa60a34dd2ab5dbfbe691bdbf1cd5253dcdd.tar.xz
dpaa_eth: release CGR ids after delete
Improper ordering of CGR release and delete operations lead to QMan CGR list corruption. Signed-off-by: Madalin Bucur <madalin.bucur@freescale.com> Change-Id: I7817210fbc71d5b7b414ba866c588e97e89e39f0 Reviewed-on: http://git.am.freescale.net:8181/28533 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Marian Cristian Rotariu <marian.rotariu@freescale.com>
Diffstat (limited to 'drivers/net/ethernet')
-rw-r--r--drivers/net/ethernet/freescale/dpa/dpaa_eth.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/freescale/dpa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpa/dpaa_eth.c
index 74f67f5..6ef3bdf 100644
--- a/drivers/net/ethernet/freescale/dpa/dpaa_eth.c
+++ b/drivers/net/ethernet/freescale/dpa/dpaa_eth.c
@@ -1085,11 +1085,11 @@ pfc_mapping_failed:
#endif
dpa_fq_free(dev, &priv->dpa_fq_list);
fq_alloc_failed:
+ qman_delete_cgr_safe(&priv->ingress_cgr);
qman_release_cgrid(priv->ingress_cgr.cgrid);
- qman_delete_cgr(&priv->ingress_cgr);
rx_cgr_init_failed:
+ qman_delete_cgr_safe(&priv->cgr_data.cgr);
qman_release_cgrid(priv->cgr_data.cgr.cgrid);
- qman_delete_cgr(&priv->cgr_data.cgr);
tx_cgr_init_failed:
add_channel_failed:
get_channel_failed: