diff options
| author | Andreas Eversberg <jolly@eversberg.eu> | 2011-08-04 19:28:35 +0200 |
|---|---|---|
| committer | Andreas Eversberg <jolly@eversberg.eu> | 2011-08-04 19:30:29 +0200 |
| commit | 3b2b3b09a9ce8ff7d8fcfc3107172008a322372b (patch) | |
| tree | 7083ffbd15e6cc9806b64a3ebc8f7e6c9682e9b4 /src/host | |
| parent | 178992a23246f8398c27e97546e135f7a470b047 (diff) | |
Fix of wong Classmark 1 on Location Updating and IMSI Detach
The reason for the the wrong power capability comes from the fact that
"rr->cd_now" is not yet set and so the ARFCN is 0 which causes the
GSM900 power capability to be used. It is set to "Class 4" in the
configuration file per default, however this value is not defined for
GSM1800/1900.
Thanx to Dieter Spaar for finding this bug!
Diffstat (limited to 'src/host')
| -rw-r--r-- | src/host/layer23/src/mobile/gsm48_mm.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/host/layer23/src/mobile/gsm48_mm.c b/src/host/layer23/src/mobile/gsm48_mm.c index e84d26ab..ec393c2b 100644 --- a/src/host/layer23/src/mobile/gsm48_mm.c +++ b/src/host/layer23/src/mobile/gsm48_mm.c @@ -1777,6 +1777,7 @@ static int gsm48_mm_tx_imsi_detach(struct osmocom_ms *ms, int rr_prim) struct gsm_support *sup = &ms->support; struct gsm_settings *set = &ms->settings; struct gsm48_rrlayer *rr = &ms->rrlayer; + struct gsm322_cellsel *cs = &ms->cellsel; struct msgb *nmsg; struct gsm48_hdr *ngh; uint8_t pwr_lev; @@ -1795,7 +1796,10 @@ static int gsm48_mm_tx_imsi_detach(struct osmocom_ms *ms, int rr_prim) ngh->msg_type = GSM48_MT_MM_IMSI_DETACH_IND; /* classmark 1 */ - pwr_lev = gsm48_current_pwr_lev(set, rr->cd_now.arfcn); + if (rr_prim == GSM48_RR_EST_REQ) + pwr_lev = gsm48_current_pwr_lev(set, cs->sel_arfcn); + else + pwr_lev = gsm48_current_pwr_lev(set, rr->cd_now.arfcn); gsm48_encode_classmark1(&cm, sup->rev_lev, sup->es_ind, set->a5_1, pwr_lev); msgb_v_put(nmsg, *((uint8_t *)&cm)); @@ -2290,7 +2294,7 @@ static int gsm48_mm_tx_loc_upd_req(struct osmocom_ms *ms) struct gsm_settings *set = &ms->settings; struct gsm_support *sup = &ms->support; struct gsm_subscriber *subscr = &ms->subscr; - struct gsm48_rrlayer *rr = &ms->rrlayer; + struct gsm322_cellsel *cs = &ms->cellsel; struct msgb *nmsg; struct gsm48_hdr *ngh; struct gsm48_loc_upd_req *nlu; /* NOTE: mi_len is part of struct */ @@ -2321,7 +2325,7 @@ static int gsm48_mm_tx_loc_upd_req(struct osmocom_ms *ms) gsm_print_mcc(subscr->mcc), gsm_print_mnc(subscr->mnc), subscr->lac); /* classmark 1 */ - pwr_lev = gsm48_current_pwr_lev(set, rr->cd_now.arfcn); + pwr_lev = gsm48_current_pwr_lev(set, cs->sel_arfcn); gsm48_encode_classmark1(&nlu->classmark1, sup->rev_lev, sup->es_ind, set->a5_1, pwr_lev); /* MI */ |