SI13: drop PBCCH-related bits

According to 3GPP TS 44.018 ยง1.8 the "network shall never enable PBCCH
and PCCCH".

Change-Id: I319e71a4b0c682361529e9c21377398a826b934b
Related: OS#2400
diff --git a/src/libbsc/system_information.c b/src/libbsc/system_information.c
index c0df8bb..c9da4b2 100644
--- a/src/libbsc/system_information.c
+++ b/src/libbsc/system_information.c
@@ -1081,15 +1081,10 @@
 	},
 	.bcch_change_mark	= 1,
 	.si_change_field	= 0,
-	.pbcch_present		= 0,
-	{
-		.no_pbcch = {
-			.rac		= 0,	/* needs to be patched */
-			.spgc_ccch_sup 	= 0,
-			.net_ctrl_ord	= 0,
-			.prio_acc_thr	= 6,
-		},
-	},
+	.rac		= 0,	/* needs to be patched */
+	.spgc_ccch_sup 	= 0,
+	.net_ctrl_ord	= 0,
+	.prio_acc_thr	= 6,
 };
 
 static int generate_si13(enum osmo_sysinfo_type t, struct gsm_bts *bts)
@@ -1104,8 +1099,8 @@
 	si13->header.skip_indicator = 0;
 	si13->header.system_information = GSM48_MT_RR_SYSINFO_13;
 
-	si13_default.no_pbcch.rac = bts->gprs.rac;
-	si13_default.no_pbcch.net_ctrl_ord = bts->gprs.net_ctrl_ord;
+	si13_default.rac = bts->gprs.rac;
+	si13_default.net_ctrl_ord = bts->gprs.net_ctrl_ord;
 
 	si13_default.cell_opts.ctrl_ack_type_use_block =
 		bts->gprs.ctrl_ack_type_use_block;