diff options
| author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2016-05-17 23:20:03 +0200 |
|---|---|---|
| committer | Holger Freyther <holger@freyther.de> | 2016-05-30 21:28:40 +0000 |
| commit | 82dd983dd85c04b5aa013365334f2a249140902e (patch) | |
| tree | 8d60edd8118dce1cbb12047058b3f7a3a91749db /openbsc/src/libbsc/system_information.c | |
| parent | 307e40648e359015be0ce663c8a7c5356ed191f4 (diff) | |
bsc: Create minimal SI6 rest octets
In GSM R99 SI6 has mandatory SI6 rest octets and so far we did
not include them. Add minimal support to generate the right band
indicator.
Target a slightly older version of the SI6 rest octets as we neither
support MBMS nor Random bit stream but should include the band
indicator.
Change-Id: I417a40eb91f42a3416b4e07bb9fb4d7a01aaa36b
Fixes: OS#1698
Related: OS#1725
Reviewed-on: https://gerrit.osmocom.org/71
Tested-by: Jenkins Builder
Reviewed-by: Max <msuraev@sysmocom.de>
Reviewed-by: Holger Freyther <holger@freyther.de>
Diffstat (limited to 'openbsc/src/libbsc/system_information.c')
| -rw-r--r-- | openbsc/src/libbsc/system_information.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/openbsc/src/libbsc/system_information.c b/openbsc/src/libbsc/system_information.c index bf203944d..d40bbaf52 100644 --- a/openbsc/src/libbsc/system_information.c +++ b/openbsc/src/libbsc/system_information.c @@ -905,6 +905,7 @@ static int generate_si6(uint8_t *output, struct gsm_bts *bts) { struct gsm48_system_information_type_6 *si6; int l2_plen = 11; + int rc; memset(output, GSM_MACBLOCK_PADDING, GSM_MACBLOCK_LEN); @@ -935,8 +936,9 @@ static int generate_si6(uint8_t *output, struct gsm_bts *bts) gsm48_set_dtx(&si6->cell_options, bts->dtxu, bts->dtxu, false); /* SI6 Rest Octets: 10.5.2.35a: PCH / NCH info, VBS/VGCS options */ + rc = rest_octets_si6(si6->rest_octets, is_dcs_net(bts)); - return l2_plen; + return l2_plen + rc; } static struct gsm48_si13_info si13_default = { |