forked from Openwrt/openwrt
11baab9fac
This makes the components used on the lantiq SoCs compile with kernel 6.1. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> [also fix ifxmips_ptm_adsl.c] Signed-off-by: Martin Schiller <ms@dev.tdt.de>
37 lines
1.3 KiB
Diff
37 lines
1.3 KiB
Diff
--- a/src/pm/drv_dsl_cpe_pm_core.c
|
|
+++ b/src/pm/drv_dsl_cpe_pm_core.c
|
|
@@ -2274,16 +2274,18 @@ DSL_Error_t DSL_DRV_PM_CountersReset(
|
|
}
|
|
#endif /* #ifdef INCLUDE_DSL_CPE_PM_HISTORY*/
|
|
|
|
- if (ResetType == DSL_PM_RESET_HISTORY)
|
|
- break;
|
|
+ if (ResetType == DSL_PM_RESET_HISTORY)
|
|
+ break;
|
|
|
|
+ fallthrough;
|
|
case DSL_PM_RESET_TOTAL:
|
|
#ifdef INCLUDE_DSL_CPE_PM_TOTAL_COUNTERS
|
|
memset(EpData.pRecTotal, 0x0, EpData.nEpRecElementSize);
|
|
#endif /* #ifdef INCLUDE_DSL_CPE_PM_TOTAL_COUNTERS*/
|
|
- if (ResetType == DSL_PM_RESET_TOTAL)
|
|
- break;
|
|
+ if (ResetType == DSL_PM_RESET_TOTAL)
|
|
+ break;
|
|
|
|
+ fallthrough;
|
|
case DSL_PM_RESET_HISTORY_SHOWTIME:
|
|
#ifdef INCLUDE_DSL_CPE_PM_SHOWTIME_COUNTERS
|
|
nErrCode = DSL_DRV_PM_HistoryDelete(pContext, EpData.pHistShowtime );
|
|
--- a/src/device/drv_dsl_cpe_device_danube.c
|
|
+++ b/src/device/drv_dsl_cpe_device_danube.c
|
|
@@ -3193,7 +3193,7 @@ DSL_Error_t DSL_DRV_DEV_AutobootHandleTr
|
|
DSL_DEV_NUM(pContext)));
|
|
}
|
|
#endif /* INCLUDE_DSL_DELT*/
|
|
- /* Pass through */
|
|
+ fallthrough ;
|
|
case DSL_LINESTATE_IDLE:
|
|
#if defined(INCLUDE_DSL_PM) && defined(INCLUDE_DSL_CPE_PM_LINE_COUNTERS)
|
|
if ( (pContext->bGotFullInit == DSL_TRUE) &&
|