gprs: more conditionals for Gb specific actions
Change-Id: I213d21b9ddbf19e56269defcc6aa65aca4947140
This commit is contained in:
parent
7ec8ca422c
commit
f9f4387686
|
@ -1227,8 +1227,8 @@ static int gsm48_rx_gmm_ra_upd_req(struct sgsn_mm_ctx *mmctx, struct msgb *msg,
|
||||||
rate_ctr_inc(&mmctx->ctrg->ctr[GMM_CTR_PKTS_SIG_IN]);
|
rate_ctr_inc(&mmctx->ctrg->ctr[GMM_CTR_PKTS_SIG_IN]);
|
||||||
|
|
||||||
/* Update the MM context with the new RA-ID */
|
/* Update the MM context with the new RA-ID */
|
||||||
bssgp_parse_cell_id(&mmctx->ra, msgb_bcid(msg));
|
|
||||||
if (mmctx->ran_type == MM_CTX_T_GERAN_Gb) {
|
if (mmctx->ran_type == MM_CTX_T_GERAN_Gb) {
|
||||||
|
bssgp_parse_cell_id(&mmctx->ra, msgb_bcid(msg));
|
||||||
/* Update the MM context with the new (i.e. foreign) TLLI */
|
/* Update the MM context with the new (i.e. foreign) TLLI */
|
||||||
mmctx->gb.tlli = msgb_tlli(msg);
|
mmctx->gb.tlli = msgb_tlli(msg);
|
||||||
}
|
}
|
||||||
|
|
|
@ -315,8 +315,10 @@ void sgsn_pdp_ctx_terminate(struct sgsn_pdp_ctx *pdp)
|
||||||
|
|
||||||
LOGPDPCTXP(LOGL_INFO, pdp, "Forcing release of PDP context\n");
|
LOGPDPCTXP(LOGL_INFO, pdp, "Forcing release of PDP context\n");
|
||||||
|
|
||||||
/* Force the deactivation of the SNDCP layer */
|
if (pdp->mm->ran_type == MM_CTX_T_GERAN_Gb) {
|
||||||
sndcp_sm_deactivate_ind(&pdp->mm->gb.llme->lle[pdp->sapi], pdp->nsapi);
|
/* Force the deactivation of the SNDCP layer */
|
||||||
|
sndcp_sm_deactivate_ind(&pdp->mm->gb.llme->lle[pdp->sapi], pdp->nsapi);
|
||||||
|
}
|
||||||
|
|
||||||
memset(&sig_data, 0, sizeof(sig_data));
|
memset(&sig_data, 0, sizeof(sig_data));
|
||||||
sig_data.pdp = pdp;
|
sig_data.pdp = pdp;
|
||||||
|
|
|
@ -352,9 +352,11 @@ static int create_pdp_conf(struct pdp_t *pdp, void *cbp, int cause)
|
||||||
goto reject;
|
goto reject;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Activate the SNDCP layer */
|
if (pctx->mm->ran_type == MM_CTX_T_GERAN_Gb) {
|
||||||
sndcp_sm_activate_ind(&pctx->mm->gb.llme->lle[pctx->sapi], pctx->nsapi);
|
/* Activate the SNDCP layer */
|
||||||
return send_act_pdp_cont_acc(pctx);
|
sndcp_sm_activate_ind(&pctx->mm->gb.llme->lle[pctx->sapi], pctx->nsapi);
|
||||||
|
return send_act_pdp_cont_acc(pctx);
|
||||||
|
}
|
||||||
|
|
||||||
reject:
|
reject:
|
||||||
/*
|
/*
|
||||||
|
@ -392,8 +394,10 @@ static int delete_pdp_conf(struct pdp_t *pdp, void *cbp, int cause)
|
||||||
osmo_signal_dispatch(SS_SGSN, S_SGSN_PDP_DEACT, &sig_data);
|
osmo_signal_dispatch(SS_SGSN, S_SGSN_PDP_DEACT, &sig_data);
|
||||||
|
|
||||||
if (pctx->mm) {
|
if (pctx->mm) {
|
||||||
/* Deactivate the SNDCP layer */
|
if (pctx->mm->ran_type == MM_CTX_T_GERAN_Gb) {
|
||||||
sndcp_sm_deactivate_ind(&pctx->mm->gb.llme->lle[pctx->sapi], pctx->nsapi);
|
/* Deactivate the SNDCP layer */
|
||||||
|
sndcp_sm_deactivate_ind(&pctx->mm->gb.llme->lle[pctx->sapi], pctx->nsapi);
|
||||||
|
}
|
||||||
|
|
||||||
/* Confirm deactivation of PDP context to MS */
|
/* Confirm deactivation of PDP context to MS */
|
||||||
rc = gsm48_tx_gsm_deact_pdp_acc(pctx);
|
rc = gsm48_tx_gsm_deact_pdp_acc(pctx);
|
||||||
|
|
Loading…
Reference in New Issue