diff options
| author | Andreas Eversberg <jolly@eversberg.eu> | 2012-07-08 18:03:04 +0200 |
|---|---|---|
| committer | Andreas Eversberg <jolly@eversberg.eu> | 2012-07-08 18:03:04 +0200 |
| commit | b57e17394befd74f1e3259ac8f3f5257022970e1 (patch) | |
| tree | 7d42a279ea8e917a21a3304d82186043285a53f0 /src/common/oml.c | |
| parent | b19592f7134baeae1541e55b6efead887739291d (diff) | |
Fixes for handling of GPRS NSE/NSVC/CELL MO
Diffstat (limited to 'src/common/oml.c')
| -rw-r--r-- | src/common/oml.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/common/oml.c b/src/common/oml.c index 8c0759a0..381077ad 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -801,8 +801,10 @@ static int down_fom(struct gsm_bts *bts, struct msgb *msg) #define TLVP_PRES_LEN(tp, tag, min_len) \ (TLVP_PRESENT(tp, tag) && TLVP_LEN(tp, tag) >= min_len) -static int oml_ipa_mo_set_attr_nse(struct gsm_bts *bts, struct tlv_parsed *tp) +static int oml_ipa_mo_set_attr_nse(void *obj, struct tlv_parsed *tp) { + struct gsm_bts *bts = container_of(obj, struct gsm_bts, gprs.nse); + if (TLVP_PRES_LEN(tp, NM_ATT_IPACC_NSEI, 2)) { bts->gprs.nse.nsei = ntohs(*(uint16_t *) TLVP_VAL(tp, NM_ATT_IPACC_NSEI)); @@ -821,8 +823,9 @@ static int oml_ipa_mo_set_attr_nse(struct gsm_bts *bts, struct tlv_parsed *tp) return 0; } -static int oml_ipa_mo_set_attr_cell(struct gsm_bts *bts, struct tlv_parsed *tp) +static int oml_ipa_mo_set_attr_cell(void *obj, struct tlv_parsed *tp) { + struct gsm_bts *bts = container_of(obj, struct gsm_bts, gprs.cell); struct gprs_rlc_cfg *rlcc = &bts->gprs.cell.rlc_cfg; const uint8_t *cur; @@ -860,13 +863,13 @@ static int oml_ipa_mo_set_attr_cell(struct gsm_bts *bts, struct tlv_parsed *tp) for (i = 0; i < 4; i++) { if (cur[0] & (1 << i)) - rlcc->cs_mask |= GPRS_CS1+i; + rlcc->cs_mask |= (1 << (GPRS_CS1+i)); } if (cur[0] & 0x80) - rlcc->cs_mask |= GPRS_MCS9; + rlcc->cs_mask |= (1 << GPRS_MCS9); for (i = 0; i < 8; i++) { if (cur[1] & (1 << i)) - rlcc->cs_mask |= GPRS_MCS1+i; + rlcc->cs_mask |= (1 << (GPRS_MCS1+i)); } } |