aboutsummaryrefslogtreecommitdiffstats
path: root/openbsc
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2009-06-26 18:19:53 +0200
committerHarald Welte <laforge@gnumonks.org>2009-06-26 18:19:53 +0200
commitf16571635a9d81893cb7bcc3d12dbf6639f3b3df (patch)
tree81bd1cdca4686828e6c87dc3141fac9fe44b2bc7 /openbsc
parentfe9af26c3ed8f281e39be912a3bfa1e0b3f7c675 (diff)
parent560982b5d658fa5a8455eb5e2f21911496f878f0 (diff)
Merge branch 'master' into talloc
Diffstat (limited to 'openbsc')
-rw-r--r--openbsc/include/openbsc/abis_nm.h8
-rw-r--r--openbsc/src/abis_nm.c2
-rw-r--r--openbsc/src/chan_alloc.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/openbsc/include/openbsc/abis_nm.h b/openbsc/include/openbsc/abis_nm.h
index 3aac31f3..bad7d1dd 100644
--- a/openbsc/include/openbsc/abis_nm.h
+++ b/openbsc/include/openbsc/abis_nm.h
@@ -116,7 +116,7 @@ enum abis_nm_msgtype {
NM_MT_SET_CHAN_ATTR_NACK,
/* Test Management Messages */
NM_MT_PERF_TEST = 0x51,
- NM_MT_PERF_TESET_ACK,
+ NM_MT_PERF_TEST_ACK,
NM_MT_PERF_TEST_NACK,
NM_MT_TEST_REP,
NM_MT_SEND_TEST_REP,
@@ -338,7 +338,7 @@ enum abis_nm_attr {
NM_ATT_BS11_ALL_TEST_CATG = 0x60,
NM_ATT_BS11_BTSLS_HOPPING,
NM_ATT_BS11_CELL_ALLOC_NR,
- NM_ATT_BS11_CALL_GLOBAL_ID,
+ NM_ATT_BS11_CELL_GLOBAL_ID,
NM_ATT_BS11_ENA_INTERF_CLASS = 0x66,
NM_ATT_BS11_ENA_INT_INTEC_HANDO = 0x67,
NM_ATT_BS11_ENA_INT_INTRC_HANDO = 0x68,
@@ -422,7 +422,7 @@ enum abis_nm_chan_comb {
NM_CHANC_TCHHalf2 = 0x02,
NM_CHANC_SDCCH = 0x03,
NM_CHANC_mainBCCH = 0x04,
- NM_CHANC_BCCCHComb = 0x05,
+ NM_CHANC_BCCHComb = 0x05,
NM_CHANC_BCCH = 0x06,
NM_CHANC_BCCH_CBCH = 0x07,
NM_CHANC_SDCCH_CBCH = 0x08,
@@ -484,7 +484,7 @@ enum abis_nm_nack_cause {
NM_NACK_MSGINCONSIST_PHYSCFG = 0x23,
NM_NACK_FILE_INCOMPLETE = 0x25,
NM_NACK_FILE_NOTAVAIL = 0x26,
- MN_NACK_FILE_NOTACTIVATE = 0x27,
+ NM_NACK_FILE_NOTACTIVATE = 0x27,
NM_NACK_REQ_NOT_GRANT = 0x28,
NM_NACK_WAIT = 0x29,
NM_NACK_NOTH_REPORT_EXIST = 0x2a,
diff --git a/openbsc/src/abis_nm.c b/openbsc/src/abis_nm.c
index 5040541e..6b1fc54f 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 241d5895..fe16815c 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,