packages: refresh patches
CI is supposed to catch all of these. Some of these predate CI. Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
committed by
Hauke Mehrtens
parent
0cf4c8a986
commit
2f4bb69664
@@ -13,11 +13,9 @@ Signed-off-by: Gaurav Jain <gaurav.jain@nxp.com>
|
||||
ioctl.c | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/ioctl.c b/ioctl.c
|
||||
index 8f241b86..4262bbd5 100644
|
||||
--- a/ioctl.c
|
||||
+++ b/ioctl.c
|
||||
@@ -1246,7 +1246,9 @@ static struct ctl_table verbosity_ctl_root[] = {
|
||||
@@ -1246,7 +1246,9 @@ static struct ctl_table verbosity_ctl_ro
|
||||
{
|
||||
.procname = "ioctl",
|
||||
.mode = 0555,
|
||||
|
||||
@@ -12,11 +12,9 @@ Signed-off-by: Gaurav Jain <gaurav.jain@nxp.com>
|
||||
zc.c | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/zc.c b/zc.c
|
||||
index fdf7da17..6637945a 100644
|
||||
--- a/zc.c
|
||||
+++ b/zc.c
|
||||
@@ -80,10 +80,14 @@ int __get_userbuf(uint8_t __user *addr, uint32_t len, int write,
|
||||
@@ -80,10 +80,14 @@ int __get_userbuf(uint8_t __user *addr,
|
||||
ret = get_user_pages_remote(task, mm,
|
||||
(unsigned long)addr, pgcount, write ? FOLL_WRITE : 0,
|
||||
pg, NULL, NULL);
|
||||
|
||||
@@ -23,11 +23,9 @@ Signed-off-by: Joan Bruguera Micó <joanbrugueram@gmail.com>
|
||||
zc.c | 2 +-
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/ioctl.c b/ioctl.c
|
||||
index 4262bbd..e3eefe1 100644
|
||||
--- a/ioctl.c
|
||||
+++ b/ioctl.c
|
||||
@@ -1246,7 +1246,7 @@ static struct ctl_table verbosity_ctl_root[] = {
|
||||
@@ -1246,7 +1246,7 @@ static struct ctl_table verbosity_ctl_ro
|
||||
{
|
||||
.procname = "ioctl",
|
||||
.mode = 0555,
|
||||
@@ -45,11 +43,9 @@ index 4262bbd..e3eefe1 100644
|
||||
verbosity_sysctl_header = register_sysctl_table(verbosity_ctl_root);
|
||||
#else
|
||||
verbosity_sysctl_header = register_sysctl(verbosity_ctl_root->procname, verbosity_ctl_dir);
|
||||
diff --git a/zc.c b/zc.c
|
||||
index 6637945..00e00c1 100644
|
||||
--- a/zc.c
|
||||
+++ b/zc.c
|
||||
@@ -80,7 +80,7 @@ int __get_userbuf(uint8_t __user *addr, uint32_t len, int write,
|
||||
@@ -80,7 +80,7 @@ int __get_userbuf(uint8_t __user *addr,
|
||||
ret = get_user_pages_remote(task, mm,
|
||||
(unsigned long)addr, pgcount, write ? FOLL_WRITE : 0,
|
||||
pg, NULL, NULL);
|
||||
|
||||
@@ -17,11 +17,9 @@ Signed-off-by: Joan Bruguera Micó <joanbrugueram@gmail.com>
|
||||
cryptlib.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/cryptlib.c b/cryptlib.c
|
||||
index 4d739e5..0e59d4c 100644
|
||||
--- a/cryptlib.c
|
||||
+++ b/cryptlib.c
|
||||
@@ -381,7 +381,11 @@ int cryptodev_hash_init(struct hash_data *hdata, const char *alg_name,
|
||||
@@ -381,7 +381,11 @@ int cryptodev_hash_init(struct hash_data
|
||||
}
|
||||
|
||||
hdata->digestsize = crypto_ahash_digestsize(hdata->async.s);
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
#if defined(ENABLE_FW_PROC) && ENABLE_FW_PROC
|
||||
static int proc_read_genconf(char *, char **, off_t, int, int *, void *);
|
||||
#endif
|
||||
@@ -889,6 +891,7 @@ static INLINE void proc_file_delete(void
|
||||
@@ -896,6 +898,7 @@ static INLINE void proc_file_delete(void
|
||||
remove_proc_entry("driver/ifx_ptm", NULL);
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
static int proc_read_version(char *buf, char **start, off_t offset, int count, int *eof, void *data)
|
||||
{
|
||||
int len = 0;
|
||||
@@ -963,8 +966,9 @@ static int proc_write_wanmib(struct file
|
||||
@@ -970,8 +973,9 @@ static int proc_write_wanmib(struct file
|
||||
|
||||
return count;
|
||||
}
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
static INLINE int strincmp(const char *, const char *, int);
|
||||
#endif
|
||||
static INLINE int ifx_ptm_version(char *);
|
||||
@@ -1159,8 +1159,6 @@ static int proc_write_dbg(struct file *f
|
||||
@@ -1166,8 +1166,6 @@ static int proc_write_dbg(struct file *f
|
||||
return count;
|
||||
}
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
static INLINE int stricmp(const char *p1, const char *p2)
|
||||
{
|
||||
int c1, c2;
|
||||
@@ -1178,7 +1176,6 @@ static INLINE int stricmp(const char *p1
|
||||
@@ -1185,7 +1183,6 @@ static INLINE int stricmp(const char *p1
|
||||
return *p1 - *p2;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/src/drv_tapi_cid.c
|
||||
+++ b/src/drv_tapi_cid.c
|
||||
@@ -1424,6 +1424,8 @@ static IFX_int32_t cid_lookup_transparent(TAPI_CIDTX_DATA_t *pTxData,
|
||||
@@ -1424,6 +1424,8 @@ static IFX_int32_t cid_lookup_transparen
|
||||
|
||||
cidfsk_set_tx_time (pTxData, &pConfData->TapiCidFskConf);
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
case IFX_TAPI_CID_GEN_TYPE_DTMF:
|
||||
memcpy (pTxData->cidBuf[IFX_TAPI_CID_GEN_TYPE_DTMF].pBuf,
|
||||
pMessage[0].transparent.data, pMessage[0].transparent.len);
|
||||
@@ -1497,6 +1499,7 @@ static IFX_int32_t cid_prepare_data(TAPI_CHANNEL *pChannel,
|
||||
@@ -1497,6 +1499,7 @@ static IFX_int32_t cid_prepare_data(TAPI
|
||||
break;
|
||||
case IFX_TAPI_CID_STD_KPN_DTMF:
|
||||
/*lint -fallthrough*/
|
||||
@@ -17,7 +17,7 @@
|
||||
case IFX_TAPI_CID_STD_KPN_DTMF_FSK:
|
||||
if (IFX_TAPI_CID_HM_ONHOOK == pTxData->txHookMode)
|
||||
{
|
||||
@@ -1506,6 +1509,7 @@ static IFX_int32_t cid_prepare_data(TAPI_CHANNEL *pChannel,
|
||||
@@ -1506,6 +1509,7 @@ static IFX_int32_t cid_prepare_data(TAPI
|
||||
}
|
||||
/* KPN CID Type 2 (off-hook) always using FSK */
|
||||
/*lint -fallthrough*/
|
||||
@@ -25,7 +25,7 @@
|
||||
default:
|
||||
pTxData->cidGenType = IFX_TAPI_CID_GEN_TYPE_FSK;
|
||||
break;
|
||||
@@ -1532,6 +1536,7 @@ static IFX_int32_t cid_prepare_data(TAPI_CHANNEL *pChannel,
|
||||
@@ -1532,6 +1536,7 @@ static IFX_int32_t cid_prepare_data(TAPI
|
||||
break;
|
||||
|
||||
/*lint -fallthrough*/
|
||||
@@ -33,7 +33,7 @@
|
||||
case IFX_TAPI_CID_GEN_TYPE_FSK:
|
||||
|
||||
if (IFX_TAPI_CID_STD_NTT == pConfData->nStandard)
|
||||
@@ -2036,6 +2041,7 @@ static FSM_STATUS_t cid_fsm_alert_exec(TAPI_CHANNEL *pChannel)
|
||||
@@ -2036,6 +2041,7 @@ static FSM_STATUS_t cid_fsm_alert_exec(T
|
||||
}
|
||||
pTxData->nCidSubState++;
|
||||
/*lint -fallthrough*/
|
||||
@@ -41,7 +41,7 @@
|
||||
case 1:
|
||||
if (pConfData->OSIoffhook && pConfData->nSAStone)
|
||||
{
|
||||
@@ -2052,6 +2058,7 @@ static FSM_STATUS_t cid_fsm_alert_exec(TAPI_CHANNEL *pChannel)
|
||||
@@ -2052,6 +2058,7 @@ static FSM_STATUS_t cid_fsm_alert_exec(T
|
||||
}
|
||||
pTxData->nCidSubState++;
|
||||
/*lint -fallthrough*/
|
||||
@@ -49,7 +49,7 @@
|
||||
case 2:
|
||||
if (pConfData->nSAStone)
|
||||
{
|
||||
@@ -2069,6 +2076,7 @@ static FSM_STATUS_t cid_fsm_alert_exec(TAPI_CHANNEL *pChannel)
|
||||
@@ -2069,6 +2076,7 @@ static FSM_STATUS_t cid_fsm_alert_exec(T
|
||||
}
|
||||
pTxData->nCidSubState++;
|
||||
/*lint -fallthrough*/
|
||||
@@ -57,7 +57,7 @@
|
||||
default:
|
||||
/* Play CAS tone on data channel, use unprotected function, protection
|
||||
is done around cid_fsm_alert_exec */
|
||||
@@ -3458,6 +3466,7 @@ IFX_int32_t TAPI_Phone_CID_Stop_Tx(TAPI_CHANNEL *pChannel)
|
||||
@@ -3458,6 +3466,7 @@ IFX_int32_t TAPI_Phone_CID_Stop_Tx(TAPI_
|
||||
}
|
||||
/* deliberately fall through */
|
||||
/*lint -fallthrough*/
|
||||
@@ -65,7 +65,7 @@
|
||||
case TAPI_CID_STATE_ACK:
|
||||
/* deactivate the DTMF override - last two params are ignored */
|
||||
if (ptr_chk(pDrvCtx->SIG.DTMFD_Override, ""))
|
||||
@@ -3469,6 +3478,7 @@ IFX_int32_t TAPI_Phone_CID_Stop_Tx(TAPI_CHANNEL *pChannel)
|
||||
@@ -3469,6 +3478,7 @@ IFX_int32_t TAPI_Phone_CID_Stop_Tx(TAPI_
|
||||
}
|
||||
/* deliberately fall through */
|
||||
/*lint -fallthrough*/
|
||||
@@ -73,7 +73,7 @@
|
||||
case TAPI_CID_STATE_SENDING:
|
||||
TAPI_Stop_Timer (pTxData->CidTimerID);
|
||||
break;
|
||||
@@ -4066,6 +4076,7 @@ IFX_int32_t TAPI_Phone_Get_CidRxData (TAPI_CHANNEL *pChannel,
|
||||
@@ -4066,6 +4076,7 @@ IFX_int32_t TAPI_Phone_Get_CidRxData (TA
|
||||
/* If the fifo is not empty take the data from the fifo first. */
|
||||
/* deliberately fallthrough to default case */
|
||||
/*lint -fallthrough*/
|
||||
@@ -83,7 +83,7 @@
|
||||
When there is no data in the fifo TAPI_statusErr is returned. */
|
||||
--- a/src/drv_tapi_dial.c
|
||||
+++ b/src/drv_tapi_dial.c
|
||||
@@ -319,6 +319,8 @@ static IFX_void_t ifx_tapi_dial_OnTimer(Timer_ID Timer, IFX_ulong_t nArg)
|
||||
@@ -319,6 +319,8 @@ static IFX_void_t ifx_tapi_dial_OnTimer(
|
||||
/* NOTE: the "break" statement has been intentionally omitted */
|
||||
/*lint -fallthrough */
|
||||
|
||||
@@ -94,7 +94,7 @@
|
||||
certain low pulse (not noise). The next state is the overlap with
|
||||
--- a/src/drv_tapi_event.c
|
||||
+++ b/src/drv_tapi_event.c
|
||||
@@ -1545,6 +1545,7 @@ IFX_int32_t IFX_TAPI_Event_Dispatch_ProcessCtx(IFX_TAPI_EXT_EVENT_PARAM_t*
|
||||
@@ -1545,6 +1545,7 @@ IFX_int32_t IFX_TAPI_Event_Dispatch_Proc
|
||||
/**\todo put in device fifo */
|
||||
pEvent->ch = IFX_TAPI_DEVICE_CH_NUMBER;
|
||||
/*lint -fallthrough */
|
||||
@@ -104,7 +104,7 @@
|
||||
break;
|
||||
--- a/src/drv_tapi_ioctl.c
|
||||
+++ b/src/drv_tapi_ioctl.c
|
||||
@@ -1552,6 +1553,7 @@ static IFX_int32_t TAPI_IoctlCh (IFX_TAPI_DRV_CTX_t* pDrvCtx,
|
||||
@@ -1552,6 +1552,7 @@ static IFX_int32_t TAPI_IoctlCh (IFX_TA
|
||||
/* Dial Services */
|
||||
ret = TAPI_statusNotSupported;
|
||||
/*lint -fallthrough*/
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/src/drv_tapi_ioctl.c
|
||||
+++ b/src/drv_tapi_ioctl.c
|
||||
@@ -702,7 +702,8 @@ static IFX_int32_t TAPI_IoctlDev (IFX_TAPI_DRV_CTX_t* pDrvCtx,
|
||||
@@ -702,7 +702,8 @@ static IFX_int32_t TAPI_IoctlDev (IFX_TA
|
||||
|
||||
if (ret == TAPI_statusOk || ret == 1)
|
||||
{
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
#ifdef INCLUDE_DSL_CPE_PM_SHOWTIME_COUNTERS
|
||||
--- a/src/common/drv_dsl_cpe_api.c
|
||||
+++ b/src/common/drv_dsl_cpe_api.c
|
||||
@@ -2652,6 +2652,8 @@ DSL_Error_t DSL_DRV_AutobootControlSet(
|
||||
@@ -2653,6 +2653,8 @@ DSL_Error_t DSL_DRV_AutobootControlSet(
|
||||
/* no break */
|
||||
/* ... pass to restart*/
|
||||
|
||||
|
||||
@@ -33,4 +33,4 @@
|
||||
+ fallthrough;
|
||||
case DSL_PM_RESET_HISTORY_SHOWTIME:
|
||||
#ifdef INCLUDE_DSL_CPE_PM_SHOWTIME_COUNTERS
|
||||
nErrCode = DSL_DRV_PM_HistoryDelete(pContext, EpData.pHistShowtime );
|
||||
nErrCode = DSL_DRV_PM_HistoryDelete(pContext, EpData.pHistShowtime );
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/src/common/drv_dsl_cpe_os_linux.c
|
||||
+++ b/src/common/drv_dsl_cpe_os_linux.c
|
||||
@@ -54,7 +54,7 @@ static int DSL_DRV_Release(DSL_DRV_inode_t * ino, DSL_DRV_file_t * fil);
|
||||
@@ -54,7 +54,7 @@ static int DSL_DRV_Release(DSL_DRV_inode
|
||||
|
||||
static DSL_uint_t DSL_DRV_Poll(DSL_DRV_file_t *pFile, DSL_DRV_Poll_Table_t *wait);
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
static void DSL_DRV_NlSendMsg(DSL_char_t* pMsg);
|
||||
#endif
|
||||
|
||||
@@ -368,10 +368,10 @@ int DSL_DRV_debug_printf(DSL_Context_t const *pContext, DSL_char_t const *fmt, .
|
||||
@@ -368,10 +368,10 @@ int DSL_DRV_debug_printf(DSL_Context_t c
|
||||
{
|
||||
DSL_int_t nRet = 0;
|
||||
#ifndef _lint
|
||||
@@ -22,7 +22,7 @@
|
||||
DSL_char_t debugString[DSL_DBG_MAX_DEBUG_PRINT_CHAR + 1] = {0};
|
||||
va_list ap; /* points to each unnamed arg in turn */
|
||||
|
||||
@@ -406,6 +406,8 @@ int DSL_DRV_debug_printf(DSL_Context_t const *pContext, DSL_char_t const *fmt, .
|
||||
@@ -406,6 +406,8 @@ int DSL_DRV_debug_printf(DSL_Context_t c
|
||||
#endif /* DSL_DEBUG_DISABLE */
|
||||
return nRet;
|
||||
#else
|
||||
@@ -51,7 +51,7 @@
|
||||
|
||||
--- a/src/device/drv_dsl_cpe_msg_vrx.c
|
||||
+++ b/src/device/drv_dsl_cpe_msg_vrx.c
|
||||
@@ -2456,32 +2456,32 @@ DSL_Error_t DSL_DRV_VRX_SendMsgSnrPerGroupesGet(
|
||||
@@ -2456,32 +2456,32 @@ DSL_Error_t DSL_DRV_VRX_SendMsgSnrPerGro
|
||||
#endif /* defined(INCLUDE_DSL_G997_PER_TONE) || defined(INCLUDE_DSL_DELT)*/
|
||||
|
||||
#ifdef INCLUDE_DSL_DELT
|
||||
@@ -78,9 +78,6 @@
|
||||
- memcpy(pDst,pSrc,valueSize);
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- return DSL_SUCCESS;
|
||||
-}
|
||||
+// static DSL_Error_t DSL_DRV_VRX_SpreadArray(
|
||||
+// DSL_void_t* pArray,
|
||||
+// DSL_uint16_t valueSize,
|
||||
@@ -104,7 +101,9 @@
|
||||
+// memcpy(pDst,pSrc,valueSize);
|
||||
+// }
|
||||
+// }
|
||||
+
|
||||
|
||||
- return DSL_SUCCESS;
|
||||
-}
|
||||
+// return DSL_SUCCESS;
|
||||
+// }
|
||||
|
||||
@@ -112,7 +111,7 @@
|
||||
This function requests a set of up to 60 entries of the DELT data.
|
||||
--- a/src/device/drv_dsl_cpe_device_vrx.c
|
||||
+++ b/src/device/drv_dsl_cpe_device_vrx.c
|
||||
@@ -3356,7 +3356,9 @@ static DSL_Error_t DSL_DRV_VRX_TestParametersFeUpdate(
|
||||
@@ -3356,7 +3356,9 @@ static DSL_Error_t DSL_DRV_VRX_TestParam
|
||||
DSL_Error_t nErrCode = DSL_SUCCESS;
|
||||
DSL_uint16_t i = 0;
|
||||
DSL_uint16_t nDataLen = 0;
|
||||
@@ -122,7 +121,7 @@
|
||||
|
||||
DSL_DEBUG( DSL_DBG_MSG,
|
||||
(pContext, SYS_DBG_MSG"DSL[%02d]: IN - DSL_DRV_VRX_TestParametersFeUpdate"
|
||||
@@ -8312,6 +8314,7 @@ DSL_Error_t DSL_DRV_DEV_AutobootHandleTraining(
|
||||
@@ -8312,6 +8314,7 @@ DSL_Error_t DSL_DRV_DEV_AutobootHandleTr
|
||||
(pContext, SYS_DBG_MSG"DSL[%02d]: ORDERLY_SHUTDOWN state reached"
|
||||
DSL_DRV_CRLF, DSL_DEV_NUM(pContext)));
|
||||
/* do not use break here, continue handling */
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/src/vectoring/ifxmips_vectoring.c
|
||||
+++ b/src/vectoring/ifxmips_vectoring.c
|
||||
@@ -298,7 +298,7 @@ static int proc_write_dbg(struct file *file, const char __user *buf, size_t coun
|
||||
@@ -298,7 +298,7 @@ static int proc_write_dbg(struct file *f
|
||||
DBG_ENABLE_MASK_ALL
|
||||
};
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
char *p;
|
||||
|
||||
int len, rlen;
|
||||
@@ -306,6 +306,10 @@ static int proc_write_dbg(struct file *file, const char __user *buf, size_t coun
|
||||
@@ -306,6 +306,10 @@ static int proc_write_dbg(struct file *f
|
||||
int f_enable = 0;
|
||||
int i;
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
len = count < sizeof(str) ? count : sizeof(str) - 1;
|
||||
rlen = len - copy_from_user(str, buf, len);
|
||||
while ( rlen && str[rlen - 1] <= ' ' )
|
||||
@@ -365,6 +369,8 @@ static int proc_write_dbg(struct file *file, const char __user *buf, size_t coun
|
||||
@@ -365,6 +369,8 @@ static int proc_write_dbg(struct file *f
|
||||
}
|
||||
}
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
|
||||
#include "ifxmips_vectoring_stub.h"
|
||||
|
||||
@@ -46,13 +47,17 @@ static int proc_write_vectoring(struct file *file, const char __user *buf, size_
|
||||
@@ -46,13 +47,17 @@ static int proc_write_vectoring(struct f
|
||||
{
|
||||
char *p;
|
||||
int len;
|
||||
@@ -58,7 +58,7 @@
|
||||
len = sizeof(local_buf) < count ? sizeof(local_buf) - 1 : count;
|
||||
len = len - copy_from_user(local_buf, buf, len);
|
||||
local_buf[len] = 0;
|
||||
@@ -81,6 +86,8 @@ static int proc_write_vectoring(struct file *file, const char __user *buf, size_
|
||||
@@ -81,6 +86,8 @@ static int proc_write_vectoring(struct f
|
||||
else
|
||||
printk("echo send <size> > /proc/driver/vectoring_test\n");
|
||||
|
||||
|
||||
@@ -23,7 +23,7 @@ Signed-off-by: Paweł Owoc <frut3k7@gmail.com>
|
||||
#define PHY_805XV2 0x004DD082
|
||||
--- a/src/hsl/phy/hsl_phy.c
|
||||
+++ b/src/hsl/phy/hsl_phy.c
|
||||
@@ -271,6 +271,7 @@ phy_type_t hsl_phytype_get_by_phyid(a_uint32_t dev_id, a_uint32_t phy_id)
|
||||
@@ -271,6 +271,7 @@ phy_type_t hsl_phytype_get_by_phyid(a_ui
|
||||
case AQUANTIA_PHY_113C_B0:
|
||||
case AQUANTIA_PHY_113C_B1:
|
||||
case AQUANTIA_PHY_112C:
|
||||
|
||||
Reference in New Issue
Block a user