Change in osmo-bsc[master]: system_information: use is_ipaccess_bts() helper

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27385 ) Change subject: system_information: use is_ipaccess_bts() helper ...................................................................... system_information: use is_ipaccess_bts() helper Change-Id: Id14f39f50a6d7644f81b21c0b89e10f44901348b --- M src/osmo-bsc/system_information.c 1 file changed, 4 insertions(+), 24 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/85/27385/1 diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c index dfde5a2..bedba3a 100644 --- a/src/osmo-bsc/system_information.c +++ b/src/osmo-bsc/system_information.c @@ -1066,14 +1066,9 @@ 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 @@ 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 @@ 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 @@ 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; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27385 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id14f39f50a6d7644f81b21c0b89e10f44901348b Gerrit-Change-Number: 27385 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange