diff options
author | Rich Schmitt <B43082@freescale.com> | 2014-10-31 15:03:32 (GMT) |
---|---|---|
committer | Matthew Weigel <Matthew.Weigel@freescale.com> | 2014-12-11 18:39:21 (GMT) |
commit | 0b18afe44faef1516f66168bbf782ebad4040006 (patch) | |
tree | 1c0fd882a9dd5476a835b410109ca9ebbd95278e /drivers/net/ethernet/freescale/fman/src | |
parent | 23fd3e4bab3478f2b620732c0a4e07b3567b9f1c (diff) | |
parent | bbadd4637d89b404a1b6a539ea72b37d4a748001 (diff) | |
download | linux-fsl-qoriq-0b18afe44faef1516f66168bbf782ebad4040006.tar.xz |
Integrate t1024 patches
Merge remote-tracking branch 't1024-linux/master'
Diffstat (limited to 'drivers/net/ethernet/freescale/fman/src')
-rw-r--r-- | drivers/net/ethernet/freescale/fman/src/wrapper/lnxwrp_ioctls_fm_compat.h | 3 |
1 files changed, 3 insertions, 0 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 ae19b68..471a1cf 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 @@ -350,6 +350,9 @@ typedef struct ioc_compat_fm_port_pcd_params_t { compat_uptr_t p_kg_params; compat_uptr_t p_plcr_params; compat_uptr_t p_ip_reassembly_manip; +#if DPAA_VERSION >= 11 + compat_uptr_t p_capwap_reassembly_manip; +#endif } ioc_compat_fm_port_pcd_params_t; typedef struct ioc_compat_fm_pcd_kg_cc_t { |