diff options
| author |   Luca Boccassi <luca.boccassi@gmail.com> | 2018-08-14 18:55:37 +0100 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2018-08-14 18:57:39 +0100 |
| commit | ae1479de3027a4a0f68d90bf65ac6ff2b862b837 (patch) | |
| tree | 5dbca675b6717b6b61abbe1a9583d5166fed942b /drivers/baseband | |
| parent | 8cee230dd1f0f9f31f4b0339c671d0b1ee14e111 (diff) | |
| parent | b63264c8342e6a1b6971c79550d2af2024b6a4de (diff) | |
Merge branch 'upstream' into 18.08.x
Change-Id: Ifbda2d554199dd4d11e01f0090881b5f0103ae12
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>
Diffstat (limited to 'drivers/baseband')
| -rw-r--r-- | drivers/baseband/null/bbdev_null.c | 4 | ||||
| -rw-r--r-- | drivers/baseband/turbo_sw/bbdev_turbo_software.c | 12 |
2 files changed, 6 insertions, 10 deletions
diff --git a/drivers/baseband/null/bbdev_null.c b/drivers/baseband/null/bbdev_null.c index 76fc9d7a..2f251510 100644 --- a/drivers/baseband/null/bbdev_null.c +++ b/drivers/baseband/null/bbdev_null.c @@ -348,9 +348,7 @@ RTE_PMD_REGISTER_PARAM_STRING(DRIVER_NAME, BBDEV_NULL_SOCKET_ID_ARG"=<int>"); RTE_PMD_REGISTER_ALIAS(DRIVER_NAME, bbdev_null); -RTE_INIT(null_bbdev_init_log); -static void -null_bbdev_init_log(void) +RTE_INIT(null_bbdev_init_log) { bbdev_null_logtype = rte_log_register("pmd.bb.null"); if (bbdev_null_logtype >= 0) diff --git a/drivers/baseband/turbo_sw/bbdev_turbo_software.c b/drivers/baseband/turbo_sw/bbdev_turbo_software.c index 05e95ed9..8ceb2769 100644 --- a/drivers/baseband/turbo_sw/bbdev_turbo_software.c +++ b/drivers/baseband/turbo_sw/bbdev_turbo_software.c @@ -490,8 +490,8 @@ process_enc_cb(struct turbo_sw_queue *q, struct rte_bbdev_enc_op *op, return; } crc_req.data = in; - crc_req.len = (k - 24) >> 3; - /* Check if there is a room for CRC bits. If not use + crc_req.len = k - 24; + /* Check if there is a room for CRC bits if not use * the temporary buffer. */ if (rte_pktmbuf_append(m_in, 3) == NULL) { @@ -522,8 +522,8 @@ process_enc_cb(struct turbo_sw_queue *q, struct rte_bbdev_enc_op *op, return; } crc_req.data = in; - crc_req.len = (k - 24) >> 3; - /* Check if there is a room for CRC bits. If this is the last + crc_req.len = k - 24; + /* Check if there is a room for CRC bits if this is the last * CB in TB. If not use temporary buffer. */ if ((c - r == 1) && (rte_pktmbuf_append(m_in, 3) == NULL)) { @@ -1299,9 +1299,7 @@ RTE_PMD_REGISTER_PARAM_STRING(DRIVER_NAME, TURBO_SW_SOCKET_ID_ARG"=<int>"); RTE_PMD_REGISTER_ALIAS(DRIVER_NAME, turbo_sw); -RTE_INIT(null_bbdev_init_log); -static void -null_bbdev_init_log(void) +RTE_INIT(turbo_sw_bbdev_init_log) { bbdev_turbo_sw_logtype = rte_log_register("pmd.bb.turbo_sw"); if (bbdev_turbo_sw_logtype >= 0) |