diff options
| author | Yin Honghua-R63875 <Hong-Hua.Yin@freescale.com> | 2015-11-25 09:44:56 (GMT) |
|---|---|---|
| committer | Yin Honghua-R63875 <Hong-Hua.Yin@freescale.com> | 2015-11-25 09:44:56 (GMT) |
| commit | 08d31612af586f16eda5d6a7da8b357ed031c1cd (patch) | |
| tree | b62316c1e7f6ffd97be7009481fec09bff218a87 | |
| parent | 1cf7b574207ba4fd2709b8775befb686bae5cdbc (diff) | |
| parent | 295abbbf205a1684732f59972f1bde0236c8f352 (diff) | |
| download | linux-fsl-qoriq-08d31612af586f16eda5d6a7da8b357ed031c1cd.tar.xz | |
Merge pull request #75 in SDK/linux-devel from ~R52568/linux-devel:hotfix/QLINUX-3938-fmd-ioc_compat_fm_pcd_kg_scheme_spc_t to master
* commit '295abbbf205a1684732f59972f1bde0236c8f352':
fmd: move compat_copy_fm_pcd_kg_scheme_spc out of DPAA 11 def
fmd: PCD: fix offline port blocked by fragmented IPV6
| -rw-r--r-- | drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_ioctls_fm_compat.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_ioctls_fm_compat.h b/drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_ioctls_fm_compat.h index 2f0fdd4..7d607ac 100644 --- a/drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_ioctls_fm_compat.h +++ b/drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_ioctls_fm_compat.h @@ -562,13 +562,12 @@ typedef struct ioc_compat_fm_vsp_prs_result_params_t { compat_uptr_t p_data; } ioc_compat_fm_vsp_prs_result_params_t; +#endif /* (DPAA_VERSION >= 11) */ typedef struct ioc_compat_fm_pcd_kg_scheme_spc_t { uint32_t val; compat_uptr_t id; } ioc_compat_fm_pcd_kg_scheme_spc_t; -#endif /* (DPAA_VERSION >= 11) */ - typedef struct ioc_compat_fm_ctrl_mon_counters_params_t { uint8_t fm_ctrl_index; compat_uptr_t p_mon; @@ -746,10 +745,12 @@ void compat_copy_fm_vsp_prs_result_params( ioc_fm_vsp_prs_result_params_t *param, uint8_t compat); +#endif /* (DPAA_VERSION >= 11) */ + void compat_copy_fm_pcd_kg_scheme_spc( ioc_compat_fm_pcd_kg_scheme_spc_t *compat_param, ioc_fm_pcd_kg_scheme_spc_t *param, uint8_t compat); -#endif /* (DPAA_VERSION >= 11) */ + /* } pcd compat functions */ #endif |