diff options
| author | Harald Welte <laforge@gnumonks.org> | 2009-06-26 18:19:53 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2009-06-26 18:19:53 +0200 |
| commit | f16571635a9d81893cb7bcc3d12dbf6639f3b3df (patch) | |
| tree | 81bd1cdca4686828e6c87dc3141fac9fe44b2bc7 /openbsc/src | |
| parent | fe9af26c3ed8f281e39be912a3bfa1e0b3f7c675 (diff) | |
| parent | 560982b5d658fa5a8455eb5e2f21911496f878f0 (diff) | |
Merge branch 'master' into talloc
Diffstat (limited to 'openbsc/src')
| -rw-r--r-- | openbsc/src/abis_nm.c | 2 | ||||
| -rw-r--r-- | openbsc/src/chan_alloc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/openbsc/src/abis_nm.c b/openbsc/src/abis_nm.c index 5040541e0..6b1fc54f7 100644 --- a/openbsc/src/abis_nm.c +++ b/openbsc/src/abis_nm.c @@ -179,7 +179,7 @@ static const char *nack_cause_names[] = { [NM_NACK_MSGINCONSIST_PHYSCFG] = "Message inconsistent with physical configuration", [NM_NACK_FILE_INCOMPLETE] = "Complete file notreceived", [NM_NACK_FILE_NOTAVAIL] = "File not available at destination", - [MN_NACK_FILE_NOTACTIVATE] = "File cannot be activate", + [NM_NACK_FILE_NOTACTIVATE] = "File cannot be activate", [NM_NACK_REQ_NOT_GRANT] = "Request not granted", [NM_NACK_WAIT] = "Wait", [NM_NACK_NOTH_REPORT_EXIST] = "Nothing reportable existing", diff --git a/openbsc/src/chan_alloc.c b/openbsc/src/chan_alloc.c index 241d5895b..fe16815c6 100644 --- a/openbsc/src/chan_alloc.c +++ b/openbsc/src/chan_alloc.c @@ -55,7 +55,7 @@ struct gsm_bts_trx_ts *ts_c0_alloc(struct gsm_bts *bts, static const enum abis_nm_chan_comb chcomb4pchan[] = { [GSM_PCHAN_CCCH] = NM_CHANC_mainBCCH, - [GSM_PCHAN_CCCH_SDCCH4] = NM_CHANC_BCCCHComb, + [GSM_PCHAN_CCCH_SDCCH4] = NM_CHANC_BCCHComb, [GSM_PCHAN_TCH_F] = NM_CHANC_TCHFull, [GSM_PCHAN_TCH_H] = NM_CHANC_TCHHalf, [GSM_PCHAN_SDCCH8_SACCH8C] = NM_CHANC_SDCCH, |