diff options
| author | Rivera Jose-B46482 <German.Rivera@freescale.com> | 2013-08-30 00:14:49 (GMT) |
|---|---|---|
| committer | Rivera Jose-B46482 <German.Rivera@freescale.com> | 2013-08-30 00:18:12 (GMT) |
| commit | 1d6fb60b71a6c8f99ec9e24275718f07c101fc37 (patch) | |
| tree | a6a2bb717300c3b74645fcdb2a65ffbdba318976 /include | |
| parent | 929fcea7a3b5fc0a5a03720655fdb6cd40d69d92 (diff) | |
| download | linux-fsl-qoriq-1d6fb60b71a6c8f99ec9e24275718f07c101fc37.tar.xz | |
Revert "dpa_offload: Added Traffic Manager user-space counter implementation"
This reverts commit 658fb7c23113780e96ac8fc2503a058d49377281
This change has a bug related to misuse of the mutex_trylock() API (see line 3965) and causes non-obvious merge conflicts when merging to sdk-v1.4.x. Please rework this patch to ensure these issues are solved.
Change-Id: If6be2d7fc98e3b3f0689b8c8abd241216adfd2f9
Reviewed-on: http://git.am.freescale.net:8181/4327
Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com>
Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fsl_dpa_stats.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/fsl_dpa_stats.h b/include/linux/fsl_dpa_stats.h index 5ba731e..b8fe850 100644 --- a/include/linux/fsl_dpa_stats.h +++ b/include/linux/fsl_dpa_stats.h @@ -469,7 +469,7 @@ struct dpa_stats_cnt_traffic_mng { enum dpa_stats_cnt_traffic_mng_src src; /* - * Depending on the Traffic Manager source, the 'traffic_mng' has a + * Depending on the Traffic Manager source, the 'traffic_obj' has a * different meaning: it represents a pointer to a structure of type * 'qm_ceetm_cq' in case the traffic source is a "Class Queue" or a * pointer to a structure of type 'qm_ceetm_ccg' in case the traffic @@ -690,7 +690,7 @@ struct dpa_stats_cls_cnt_traffic_mng { enum dpa_stats_cnt_traffic_mng_src src; /* - * Depending on the Traffic Manager source, the 'traffic_mng' has a + * Depending on the Traffic Manager source, the 'traffic_obj' has a * different meaning: it represents an array of pointers to structures * of type 'qm_ceetm_cq' in case the traffic source is a "Class Queue" * or an array of pointers to structures of type 'qm_ceetm_ccg' in case |