mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 07:22:33 +00:00
119558a187
Add patch fixing compilation warning due to not handled switch
fallthrough, stack limit and compilation warning in g997 module.
Fix compilation warning:
/__w/openwrt/openwrt/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_ase/ltq-dsl-ase/drv_dsl_cpe_api-3.24.4.4/src/pm/drv_dsl_cpe_pm_core.c: In function 'DSL_DRV_PM_CountersReset':
/__w/openwrt/openwrt/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_ase/ltq-dsl-ase/drv_dsl_cpe_api-3.24.4.4/src/pm/drv_dsl_cpe_pm_core.c:2277:7: error: this statement may fall through [-Werror=implicit-fallthrough=]
2277 | if (ResetType == DSL_PM_RESET_HISTORY)
| ^
/__w/openwrt/openwrt/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_ase/ltq-dsl-ase/drv_dsl_cpe_api-3.24.4.4/src/pm/drv_dsl_cpe_pm_core.c:2280:4: note: here
2280 | case DSL_PM_RESET_TOTAL:
| ^~~~
/__w/openwrt/openwrt/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_ase/ltq-dsl-ase/drv_dsl_cpe_api-3.24.4.4/src/pm/drv_dsl_cpe_pm_core.c:2284:7: error: this statement may fall through [-Werror=implicit-fallthrough=]
2284 | if (ResetType == DSL_PM_RESET_TOTAL)
| ^
/__w/openwrt/openwrt/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_ase/ltq-dsl-ase/drv_dsl_cpe_api-3.24.4.4/src/pm/drv_dsl_cpe_pm_core.c:2287:4: note: here
2287 | case DSL_PM_RESET_HISTORY_SHOWTIME:
| ^~~~
cc1: all warnings being treated as errors
/__w/openwrt/openwrt/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_ase/ltq-dsl-ase/drv_dsl_cpe_api-3.24.4.4/src/device/drv_dsl_cpe_device_danube.c: In function 'DSL_DRV_DEV_AutobootHandleTraining':
/__w/openwrt/openwrt/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_ase/ltq-dsl-ase/drv_dsl_cpe_api-3.24.4.4/src/device/drv_dsl_cpe_device_danube.c:3189:19: error: this statement may fall through [-Werror=implicit-fallthrough=]
3189 | if (nErrCode != DSL_SUCCESS)
| ^
/__w/openwrt/openwrt/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_ase/ltq-dsl-ase/drv_dsl_cpe_api-3.24.4.4/src/device/drv_dsl_cpe_device_danube.c:3197:13: note: here
3197 | case DSL_LINESTATE_IDLE:
| ^~~~
cc1: all warnings being treated as errors
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_ase/ltq-dsl-ase/drv_dsl_cpe_api-3.24.4.4/src/g997/drv_dsl_cpe_api_g997_danube.c: In function 'DSL_DRV_DEV_G997_PowerManagementStateForcedTrigger':
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_ase/ltq-dsl-ase/drv_dsl_cpe_api-3.24.4.4/src/g997/drv_dsl_cpe_api_g997_danube.c:2532:52: error: bitwise comparison always evaluates to false [-Werror=tautological-compare]
2532 | else if (((nVal >> 4) & 0x15) == 0x9)
| ^~
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_ase/ltq-dsl-ase/drv_dsl_cpe_api-3.24.4.4/src/g997/drv_dsl_cpe_api_g997_danube.c: In function 'DSL_DRV_DEV_G997_DeltHlogGet':
/home/ansuel/openwrt-ansuel/openwrt/build_dir/target-mips-openwrt-linux-musl_musl/linux-lantiq_ase/ltq-dsl-ase/drv_dsl_cpe_api-3.24.4.4/src/g997/drv_dsl_cpe_api_g997_danube.c:2108:1: error: the frame size of 1056 bytes is larger than 1024 bytes [-Werror=frame-larger-than=]
2108 | }
| ^
cc1: all warnings being treated as errors
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
66 lines
2.7 KiB
Diff
66 lines
2.7 KiB
Diff
--- a/src/g997/drv_dsl_cpe_api_g997_danube.c
|
|
+++ b/src/g997/drv_dsl_cpe_api_g997_danube.c
|
|
@@ -1984,41 +1984,53 @@ DSL_Error_t DSL_DRV_DEV_G997_DeltHlogGet(
|
|
{
|
|
if (nDirection == DSL_DOWNSTREAM)
|
|
{
|
|
- DSL_G997_DeltHlogData_t HlogData;
|
|
+ DSL_G997_DeltHlogData_t *HlogData;
|
|
|
|
- memset(&HlogData, 0x0, sizeof(DSL_G997_DeltHlogData_t));
|
|
+ HlogData = kzalloc(sizeof(*HlogData), GFP_KERNEL);
|
|
+ if (!HlogData)
|
|
+ {
|
|
+ DSL_DEBUG(DSL_DBG_ERR,
|
|
+ (pContext, "DSL[%02d]: ERROR - Alloc HlogData failed!"DSL_DRV_CRLF,
|
|
+ DSL_DEV_NUM(pContext)));
|
|
+ return DSL_ERR_MEMORY;
|
|
+ }
|
|
+
|
|
+ memset(HlogData, 0x0, sizeof(DSL_G997_DeltHlogData_t));
|
|
|
|
/* Get SHOWTIME Hlog values*/
|
|
nErrCode = DSL_DRV_DANUBE_G997_DeltHlogGet(
|
|
- pContext, nDirection, &HlogData);
|
|
+ pContext, nDirection, HlogData);
|
|
if (nErrCode != DSL_SUCCESS)
|
|
{
|
|
DSL_DEBUG(DSL_DBG_ERR,
|
|
(pContext, "DSL[%02d]: ERROR - Showtime Hlog get failed!"DSL_DRV_CRLF,
|
|
DSL_DEV_NUM(pContext)));
|
|
+ kfree(HlogData);
|
|
return nErrCode;
|
|
}
|
|
|
|
/* if actual group size != 1, values should be spread */
|
|
- if (HlogData.nGroupSize != 1)
|
|
+ if (HlogData->nGroupSize != 1)
|
|
{
|
|
nErrCode = DSL_DRV_DANUBE_G997_DeltValuesSpread(
|
|
- 0x1, HlogData.nGroupSize, HlogData.deltHlog.nNumData,
|
|
- HlogData.deltHlog.nNSCData, pData->deltHlog.nNSCData);
|
|
+ 0x1, HlogData->nGroupSize, HlogData->deltHlog.nNumData,
|
|
+ HlogData->deltHlog.nNSCData, pData->deltHlog.nNSCData);
|
|
|
|
if (nErrCode == DSL_SUCCESS)
|
|
{
|
|
pData->deltHlog.nNumData =
|
|
- (DSL_uint16_t)(HlogData.deltHlog.nNumData * HlogData.nGroupSize);
|
|
+ (DSL_uint16_t)(HlogData->deltHlog.nNumData * HlogData->nGroupSize);
|
|
pData->nGroupSize = 1;
|
|
- pData->nMeasurementTime = HlogData.nMeasurementTime;
|
|
+ pData->nMeasurementTime = HlogData->nMeasurementTime;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
/* No spread needed, copy data*/
|
|
- memcpy(pData, &HlogData, sizeof(DSL_G997_DeltHlogData_t));
|
|
+ memcpy(pData, HlogData, sizeof(DSL_G997_DeltHlogData_t));
|
|
}
|
|
+
|
|
+ kfree(HlogData);
|
|
}
|
|
else
|
|
{
|