pespin submitted this change.

View Change

Approvals: pespin: Looks good to me, approved osmith: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified
bts-trx: Set max TRXD buf size to UINT16_MAX

Otherwise trying to allocate a msgb from it fails:
"""
In file included from /git/osmo-bts/src/osmo-bts-trx/l1_if.h:9,
from /git/osmo-bts/src/osmo-bts-trx/trx_if.c:50:
/git/osmo-bts/src/osmo-bts-trx/trx_if.c: In function ‘trx_if_send_burst’:
/git/osmo-bts/src/osmo-bts-trx/trx_if.h:6:33: error: unsigned conversion from ‘int’ to ‘uint16_t’ {aka ‘short unsigned int’} changes value from
65536’ to ‘0’ [-Werror=overflow]
6 | #define TRXD_MSG_BUF_SIZE 65536
| ^~~~~
/git/osmo-bts/src/osmo-bts-trx/trx_if.c:1126:48: note: in expansion of macro ‘TRXD_MSG_BUF_SIZE’
1126 | trx_data_last_msg = msgb_alloc(TRXD_MSG_BUF_SIZE, "tx_trxd");
| ^~~~~~~~~~~~~~~~~
"""

Simply set it to be within uint16_t range, since anyway IPv4 MTU (IP
Total Length field) is 16 bit (value including the IP header length too).

In any case, this will need to be trimmed further.

Change-Id: I980faea05dee405c974636f41ee723659d9c5229
---
M src/osmo-bts-trx/trx_if.h
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/osmo-bts-trx/trx_if.h b/src/osmo-bts-trx/trx_if.h
index 3a22a1b..13c537d 100644
--- a/src/osmo-bts-trx/trx_if.h
+++ b/src/osmo-bts-trx/trx_if.h
@@ -2,8 +2,8 @@

/* TRXC read/send buffer size */
#define TRXC_MSG_BUF_SIZE 1500
-/* TRXD read/send buffer size (max. lo MTU) */
-#define TRXD_MSG_BUF_SIZE 65536
+/* TRXD read/send buffer size (max. IPv4 MTU) */
+#define TRXD_MSG_BUF_SIZE 65535U

struct trx_dl_burst_req;
struct trx_l1h;

To view, visit change 41648. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-MessageType: merged
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I980faea05dee405c974636f41ee723659d9c5229
Gerrit-Change-Number: 41648
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de>
Gerrit-Reviewer: jolly <andreas@eversberg.eu>
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-Reviewer: osmith <osmith@sysmocom.de>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>