summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/freescale/fman/Peripherals/FM/Pcd/fm_manip.c
diff options
context:
space:
mode:
authorMandy Lavi <mandy.lavi@freescale.com>2015-03-16 11:39:33 (GMT)
committerHonghua Yin <Hong-Hua.Yin@freescale.com>2015-03-17 02:50:38 (GMT)
commitd61e341cd19b6234170fd435366100f47a871e79 (patch)
tree47b611f6f205c1f8c09a7ab8e6964a8e27fd5a14 /drivers/net/ethernet/freescale/fman/Peripherals/FM/Pcd/fm_manip.c
parent1744323ccc02b3b5188750b2a31f5e262011defe (diff)
downloadlinux-fsl-qoriq-d61e341cd19b6234170fd435366100f47a871e79.tar.xz
fmd: optimize shared schemes used for IPR across multiple ports
Change-Id: Ifb357bd9b78c06042aa6e9fbb7c50b821f955064 Signed-off-by: Mandy Lavi <mandy.lavi@freescale.com> Reviewed-on: http://git.am.freescale.net:8181/32794 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Liron Himi <Liron.Himi@freescale.com> Reviewed-by: Pinghua An <pinghua.an@freescale.com> Reviewed-by: Honghua Yin <Hong-Hua.Yin@freescale.com>
Diffstat (limited to 'drivers/net/ethernet/freescale/fman/Peripherals/FM/Pcd/fm_manip.c')
-rw-r--r--drivers/net/ethernet/freescale/fman/Peripherals/FM/Pcd/fm_manip.c25
1 files changed, 22 insertions, 3 deletions
diff --git a/drivers/net/ethernet/freescale/fman/Peripherals/FM/Pcd/fm_manip.c b/drivers/net/ethernet/freescale/fman/Peripherals/FM/Pcd/fm_manip.c
index e69ea1d..a21516b 100644
--- a/drivers/net/ethernet/freescale/fman/Peripherals/FM/Pcd/fm_manip.c
+++ b/drivers/net/ethernet/freescale/fman/Peripherals/FM/Pcd/fm_manip.c
@@ -4896,6 +4896,7 @@ t_Error FmPcdManipBuildIpReassmScheme(t_FmPcd *p_FmPcd, t_Handle h_NetEnv,
{
t_FmPcdManip *p_Manip = (t_FmPcdManip *)h_Manip;
t_FmPcdKgSchemeParams *p_SchemeParams = NULL;
+ t_Handle h_Scheme;
ASSERT_COND(p_FmPcd);
ASSERT_COND(h_NetEnv);
@@ -4905,7 +4906,23 @@ t_Error FmPcdManipBuildIpReassmScheme(t_FmPcd *p_FmPcd, t_Handle h_NetEnv,
if (p_Manip->reassmParams.ip.h_Ipv4Scheme)
return E_OK;
- p_SchemeParams = XX_Malloc(sizeof(t_FmPcdKgSchemeParams));
+ if (isIpv4) {
+ h_Scheme = FmPcdKgGetSchemeHandle(p_FmPcd, p_Manip->reassmParams.ip.relativeSchemeId[0]);
+ if (h_Scheme) {
+ /* scheme was found */
+ p_Manip->reassmParams.ip.h_Ipv4Scheme = h_Scheme;
+ return E_OK;
+ }
+ } else {
+ h_Scheme = FmPcdKgGetSchemeHandle(p_FmPcd, p_Manip->reassmParams.ip.relativeSchemeId[1]);
+ if (h_Scheme) {
+ /* scheme was found */
+ p_Manip->reassmParams.ip.h_Ipv6Scheme = h_Scheme;
+ return E_OK;
+ }
+ }
+
+ p_SchemeParams = XX_Malloc(sizeof(t_FmPcdKgSchemeParams));
if (!p_SchemeParams)
RETURN_ERROR(MAJOR, E_NO_MEMORY,
("Memory allocation failed for scheme"));
@@ -4946,10 +4963,12 @@ t_Error FmPcdManipDeleteIpReassmSchemes(t_Handle h_Manip)
ASSERT_COND(p_Manip);
- if (p_Manip->reassmParams.ip.h_Ipv4Scheme)
+ if ((p_Manip->reassmParams.ip.h_Ipv4Scheme) &&
+ !FmPcdKgIsSchemeHasOwners(p_Manip->reassmParams.ip.h_Ipv4Scheme))
FM_PCD_KgSchemeDelete(p_Manip->reassmParams.ip.h_Ipv4Scheme);
- if (p_Manip->reassmParams.ip.h_Ipv6Scheme)
+ if ((p_Manip->reassmParams.ip.h_Ipv6Scheme) &&
+ !FmPcdKgIsSchemeHasOwners(p_Manip->reassmParams.ip.h_Ipv6Scheme))
FM_PCD_KgSchemeDelete(p_Manip->reassmParams.ip.h_Ipv6Scheme);
return E_OK;