diff options
| author | jason <jason.jin@freescale.com> | 2015-07-20 04:16:36 (GMT) |
|---|---|---|
| committer | jason <jason.jin@freescale.com> | 2015-07-20 04:16:36 (GMT) |
| commit | aaa395f27e077f51c75c6aefc7bbec44732e9742 (patch) | |
| tree | aae6de1e7a36dcfdc9c00e048c3c5da8d0d1d2c6 /include | |
| parent | ec78b412ad8fab85d14ec0d692d1bd6b79561a58 (diff) | |
| parent | f488de6741d5ba805b9fe813d2ddf32368d3a888 (diff) | |
| download | linux-fsl-qoriq-aaa395f27e077f51c75c6aefc7bbec44732e9742.tar.xz | |
Merge branch 'qoriq-sdk' into LS1-SDK-Rev2.0
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fsl_qman.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/fsl_qman.h b/include/linux/fsl_qman.h index 2909cc5..991729e 100644 --- a/include/linux/fsl_qman.h +++ b/include/linux/fsl_qman.h @@ -789,7 +789,8 @@ struct qm_mcc_ceetm_mapping_shaper_tcfc_config { u32 ertcr:24; u16 crtbl; u16 ertbl; - u8 __reserved2[48]; + u8 mps; /* This will be hardcoded by driver with 60 */ + u8 __reserved2[47]; } __packed shaper_config; struct { u8 __reserved2[11]; @@ -1203,7 +1204,8 @@ struct qm_mcr_ceetm_mapping_shaper_tcfc_query { u32 ertcr:24; u16 crtbl; u16 ertbl; - u8 __reserved2[16]; + u8 mps; + u8 __reserved2[15]; u32 crat; u32 erat; u8 __reserved3[24]; |