fmd21 integration

Signed-off-by: Mandy Lavi <mandy.lavi@freescale.com>

Prev fmd integration was fmd19
Diffs from fmd19 to fmd21:

Added kgHashShift to t_FmPcdHashTableParams
Added nonConsistentSp to t_FmPcdManipReassemIpStats

sp - 2 layers separation - for future flib integration
rtc - 2 layers separation - for future flib integration

PFC enhancement (B4 Rev2 FMAN)
API addition (for B4 rev 2): FM_PORT_SetPfcPrioritiesMappingToQmanWQ

File fsl_fman.h renamed to lnxwrp_fsl_fman.h
The name fsl_fman.h has been applied to other fman internal header file

In dpaa_eth:
Due to renaming of fsl_fman.h to lnxwrp_fsl_fman.h
The relevant include lines in some of the files had to change accordingly

Change-Id: I8f25c758963a44a75ca8676aad45f7f96767b0b5
Reviewed-on: http://git.am.freescale.net:8181/2069
Reviewed-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>
Tested-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>

2 files changed, 18 insertions, 18 deletions

diff --git a/drivers/net/ethernet/freescale/fman/src/inc/wrapper/lnxwrp_fm_ext.h b/drivers/net/ethernet/freescale/fman/src/inc/wrapper/lnxwrp_fm_ext.h
index 8dda657..1b56cbd 100644
--- a/drivers/net/ethernet/freescale/fman/src/inc/wrapper/lnxwrp_fm_ext.h
+++ b/drivers/net/ethernet/freescale/fman/src/inc/wrapper/lnxwrp_fm_ext.h
@@ -154,7 +154,7 @@ t_Error  LNXWRP_FM_TEST_Free(t_Handle h_FmTestLnxWrp);
  @{
 *//***************************************************************************/
 
-#include "fsl_fman.h"
+#include "lnxwrp_fsl_fman.h"
 
 /** @} */ /* end of FM_LnxKern_ctrl_grp group */
 /** @} */ /* end of FM_LnxKern_grp group */
diff --git a/drivers/net/ethernet/freescale/fman/src/inc/wrapper/fsl_fman.h b/drivers/net/ethernet/freescale/fman/src/inc/wrapper/lnxwrp_fsl_fman.h
index 89d022b..595a7c7 100644
--- a/drivers/net/ethernet/freescale/fman/src/inc/wrapper/fsl_fman.h
+++ b/drivers/net/ethernet/freescale/fman/src/inc/wrapper/lnxwrp_fsl_fman.h
@@ -31,13 +31,13 @@
  */
 
 /******************************************************************************
- @File		fsl_fman.h
+ @File		lnxwrp_fsl_fman.h
 
  @Description	Linux internal kernel API
 *//***************************************************************************/
 
-#ifndef __FSL_FMAN_H
-#define __FSL_FMAN_H
+#ifndef __LNXWRP_FSL_FMAN_H
+#define __LNXWRP_FSL_FMAN_H
 
 #include <linux/types.h>
 #include <linux/device.h>   /* struct device */
@@ -201,7 +201,7 @@ void fm_port_pcd_bind (struct fm_port *port, struct fm_port_pcd_param *params);
  @Function	fm_port_get_buff_layout_ext_params
 
  @Description	Get data_align and manip_extra_space from the device tree
-                chosen node if aplied. 
+                chosen node if aplied.
                 This function will only update these two parameters.
                 When this port has no such parameters in the device tree
                 values will be set to 0.
@@ -316,27 +316,27 @@ int fm_get_max_frm(void);
 int fm_get_rx_extra_headroom(void);
 
 /**************************************************************************//**
- @Function	fm_port_set_rate_limit
+@Function     fm_port_set_rate_limit
 
- @Description	Configure Shaper parameter on FM-port device (Tx port).
+@Description  Configure Shaper parameter on FM-port device (Tx port).
 
- @Param[in]	port	- A handle of the FM port device.
- @Param[in]	max_burst_size	- Value of maximum burst size allowed.
- @Param[in]	rate_limit	- The required rate value.
+@Param[in]    port   - A handle of the FM port device.
+@Param[in]    max_burst_size - Value of maximum burst size allowed.
+@Param[in]    rate_limit     - The required rate value.
 
- @Cautions	Allowed only after the port is initialized.
+@Cautions     Allowed only after the port is initialized.
 *//***************************************************************************/
 int fm_port_set_rate_limit(struct fm_port *port,
-			uint16_t	max_burst_size,
-			uint32_t	rate_limit);
+                           uint16_t max_burst_size,
+                           uint32_t rate_limit);
 /**************************************************************************//**
- @Function	fm_port_set_rate_limit
+@Function     fm_port_set_rate_limit
 
- @Description	Delete Shaper configuration on FM-port device (Tx port).
+@Description  Delete Shaper configuration on FM-port device (Tx port).
 
- @Param[in]	port	- A handle of the FM port device.
+@Param[in]    port   - A handle of the FM port device.
 
- @Cautions	Allowed only after the port is initialized.
+@Cautions     Allowed only after the port is initialized.
 *//***************************************************************************/
 int fm_port_del_rate_limit(struct fm_port *port);
 
@@ -344,4 +344,4 @@ int fm_port_del_rate_limit(struct fm_port *port);
 /** @} */ /* end of FM_LnxKern_grp group */
 
 
-#endif /* __FSL_FMAN_H */
+#endif /* __LNXWRP_FSL_FMAN_H */