diff options
| -rw-r--r-- | TODO-RELEASE | 1 | ||||
| -rw-r--r-- | include/osmocom/gprs/gprs_ns.h | 1 | ||||
| -rw-r--r-- | src/gb/gprs_ns.c | 14 | ||||
| -rw-r--r-- | src/gb/gprs_ns_vty.c | 2 | ||||
| -rw-r--r-- | src/gb/libosmogb.map | 2 |
5 files changed, 7 insertions, 13 deletions
diff --git a/TODO-RELEASE b/TODO-RELEASE index a6ed7309..c9d9c560 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -11,3 +11,4 @@ gsm API/ABI change l1sap.h, added struct members to ph_data_param and ph_tch_p sim API/ABI change new osim_file_desc_find_aid() sim API/ABI change all over the place gsm new API new osmo_bts_unset_feature() +gb API/ABI change deprecate gprs_nsvc_crate(); export gprs_nsvc_create2() diff --git a/include/osmocom/gprs/gprs_ns.h b/include/osmocom/gprs/gprs_ns.h index 94d30368..65c7df3b 100644 --- a/include/osmocom/gprs/gprs_ns.h +++ b/include/osmocom/gprs/gprs_ns.h @@ -197,7 +197,6 @@ int gprs_ns_tx_unblock(struct gprs_nsvc *nsvc); /* Listen for incoming GPRS packets via NS/FR/GRE */ int gprs_ns_frgre_listen(struct gprs_ns_inst *nsi); -struct gprs_nsvc *gprs_nsvc_create(struct gprs_ns_inst *nsi, uint16_t nsvci); struct gprs_nsvc *gprs_nsvc_create2(struct gprs_ns_inst *nsi, uint16_t nsvci, uint8_t sig_weight, uint8_t data_weight); void gprs_nsvc_delete(struct gprs_nsvc *nsvc); diff --git a/src/gb/gprs_ns.c b/src/gb/gprs_ns.c index f1b36f44..14fe6614 100644 --- a/src/gb/gprs_ns.c +++ b/src/gb/gprs_ns.c @@ -347,12 +347,6 @@ struct gprs_nsvc *gprs_nsvc_create2(struct gprs_ns_inst *nsi, uint16_t nsvci, return nsvc; } -/*! Old API for creating a NS-VC. Uses gprs_nsvc_create2 with fixed weights. */ -struct gprs_nsvc *gprs_nsvc_create(struct gprs_ns_inst *nsi, uint16_t nsvci) -{ - return gprs_nsvc_create2(nsi, nsvci, 1, 1); -} - /*! Delete given NS-VC * \param[in] nsvc gprs_nsvc to be deleted */ @@ -1269,7 +1263,7 @@ static int gprs_ns_rx_reset(struct gprs_nsvc **nsvc, struct msgb *msg) nsvci, (*nsvc)->nsvci, gprs_ns_ll_str(*nsvc)); orig_nsvc = *nsvc; - *nsvc = gprs_nsvc_create((*nsvc)->nsi, nsvci); + *nsvc = gprs_nsvc_create2((*nsvc)->nsi, nsvci, 1, 1); (*nsvc)->nsei = nsei; } } @@ -1691,7 +1685,7 @@ int gprs_ns_vc_create(struct gprs_ns_inst *nsi, struct msgb *msg, * simply have changed addresses, or it is a SGSN */ existing_nsvc = gprs_nsvc_by_nsvci(nsi, nsvci); if (!existing_nsvc) { - *new_nsvc = gprs_nsvc_create(nsi, 0xffff); + *new_nsvc = gprs_nsvc_create2(nsi, 0xffff, 1, 1); (*new_nsvc)->nsvci_is_valid = 0; log_set_context(LOG_CTX_GB_NSVC, *new_nsvc); gprs_ns_ll_copy(*new_nsvc, fallback_nsvc); @@ -1914,7 +1908,7 @@ struct gprs_ns_inst *gprs_ns_instantiate(gprs_ns_cb_t *cb, void *ctx) /* Create the dummy NSVC that we use for sending * messages to non-existant/unknown NS-VC's */ - nsi->unknown_nsvc = gprs_nsvc_create(nsi, 0xfffe); + nsi->unknown_nsvc = gprs_nsvc_create2(nsi, 0xfffe, 1, 1); nsi->unknown_nsvc->nsvci_is_valid = 0; llist_del(&nsi->unknown_nsvc->list); INIT_LLIST_HEAD(&nsi->unknown_nsvc->list); @@ -2155,7 +2149,7 @@ struct gprs_nsvc *gprs_ns_nsip_connect(struct gprs_ns_inst *nsi, nsvc = gprs_nsvc_by_rem_addr(nsi, dest); if (!nsvc) - nsvc = gprs_nsvc_create(nsi, nsvci); + nsvc = gprs_nsvc_create2(nsi, nsvci, 1, 1); nsvc->ip.bts_addr = *dest; nsvc->nsei = nsei; nsvc->remote_end_is_sgsn = 1; diff --git a/src/gb/gprs_ns_vty.c b/src/gb/gprs_ns_vty.c index bd53f2f1..38d43930 100644 --- a/src/gb/gprs_ns_vty.c +++ b/src/gb/gprs_ns_vty.c @@ -292,7 +292,7 @@ DEFUN(cfg_nse_nsvc, cfg_nse_nsvci_cmd, nsvc = gprs_nsvc_by_nsei(vty_nsi, nsei); if (!nsvc) { - nsvc = gprs_nsvc_create(vty_nsi, nsvci); + nsvc = gprs_nsvc_create2(vty_nsi, nsvci, 1, 1); nsvc->nsei = nsei; } nsvc->nsvci = nsvci; diff --git a/src/gb/libosmogb.map b/src/gb/libosmogb.map index ad139c1c..b29ecb97 100644 --- a/src/gb/libosmogb.map +++ b/src/gb/libosmogb.map @@ -70,7 +70,7 @@ gprs_ns_ll_copy; gprs_ns_ll_clear; gprs_ns_msgb_alloc; -gprs_nsvc_create; +gprs_nsvc_create2; gprs_nsvc_delete; gprs_nsvc_reset; gprs_nsvc_by_nsvci; |