diff options
| author | Vadim Yanitskiy <vyanitskiy@sysmocom.de> | 2022-03-03 18:28:03 +0700 |
|---|---|---|
| committer | fixeria <vyanitskiy@sysmocom.de> | 2022-03-10 15:54:29 +0000 |
| commit | be5a6c949ece77408fae610054930b525ec8a52c (patch) | |
| tree | 8618d658869e72c4a57699ee492147eb50370b65 | |
| parent | ef919cb8c18686ac2f7f3f5f05e83c0cf5454558 (diff) | |
system_information: use is_ipaccess_bts() helper
Change-Id: Id14f39f50a6d7644f81b21c0b89e10f44901348b
| -rw-r--r-- | src/osmo-bsc/system_information.c | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index dfde5a2a6..bedba3ae5 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -1066,14 +1066,9 @@ static int generate_si5(enum osmo_sysinfo_type t, struct gsm_bts *bts) memset(output, GSM_MACBLOCK_PADDING, GSM_MACBLOCK_LEN); /* ip.access nanoBTS needs l2_plen!! */ - switch (bts->type) { - case GSM_BTS_TYPE_NANOBTS: - case GSM_BTS_TYPE_OSMOBTS: + if (is_ipaccess_bts(bts)) { *output++ = GSM48_LEN2PLEN(l2_plen); l2_plen++; - break; - default: - break; } si5 = (struct gsm48_system_information_type_5 *) output; @@ -1102,14 +1097,9 @@ static int generate_si5bis(enum osmo_sysinfo_type t, struct gsm_bts *bts) memset(output, GSM_MACBLOCK_PADDING, GSM_MACBLOCK_LEN); /* ip.access nanoBTS needs l2_plen!! */ - switch (bts->type) { - case GSM_BTS_TYPE_NANOBTS: - case GSM_BTS_TYPE_OSMOBTS: + if (is_ipaccess_bts(bts)) { *output++ = GSM48_LEN2PLEN(l2_plen); l2_plen++; - break; - default: - break; } si5b = (struct gsm48_system_information_type_5bis *) output; @@ -1146,14 +1136,9 @@ static int generate_si5ter(enum osmo_sysinfo_type t, struct gsm_bts *bts) memset(output, GSM_MACBLOCK_PADDING, GSM_MACBLOCK_LEN); /* ip.access nanoBTS needs l2_plen!! */ - switch (bts->type) { - case GSM_BTS_TYPE_NANOBTS: - case GSM_BTS_TYPE_OSMOBTS: + if (is_ipaccess_bts(bts)) { *output++ = GSM48_LEN2PLEN(l2_plen); l2_plen++; - break; - default: - break; } si5t = (struct gsm48_system_information_type_5ter *) output; @@ -1186,14 +1171,9 @@ static int generate_si6(enum osmo_sysinfo_type t, struct gsm_bts *bts) memset(&si6_ro_info, 0, sizeof(si6_ro_info)); /* ip.access nanoBTS needs l2_plen!! */ - switch (bts->type) { - case GSM_BTS_TYPE_NANOBTS: - case GSM_BTS_TYPE_OSMOBTS: + if (is_ipaccess_bts(bts)) { *output++ = GSM48_LEN2PLEN(l2_plen); l2_plen++; - break; - default: - break; } si6 = (struct gsm48_system_information_type_6 *) output; |