From aa826cdcd7c3a304d592c57b4751210f949b5f9d Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Sun, 13 Sep 2020 00:34:56 +0200 Subject: drop bsc_subscr.lac It does not make sense to set the bsc_subscr's LAC from a Paging Request, especially since the paging code has loops that possibly kick off several pagings. At this point, there remains no code setting bsub->lac anywhere. We could set it during rx of Complete Layer 3, but since there is no use for it besides a vty dump, let's just drop the bsub->lac completely, and the vty dump of it. Change-Id: Id017bd494d329b6fc254d7135b4074ac2b224d66 --- include/osmocom/bsc/bsc_subscriber.h | 1 - src/osmo-bsc/bsc_vty.c | 6 +++--- src/osmo-bsc/osmo_bsc_bssap.c | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/include/osmocom/bsc/bsc_subscriber.h b/include/osmocom/bsc/bsc_subscriber.h index 53fa7be5c..a602a9ef6 100644 --- a/include/osmocom/bsc/bsc_subscriber.h +++ b/include/osmocom/bsc/bsc_subscriber.h @@ -16,7 +16,6 @@ struct bsc_subscr { char imsi[GSM23003_IMSI_MAX_DIGITS+1]; uint32_t tmsi; - uint16_t lac; }; const char *bsc_subscr_name(struct bsc_subscr *bsub); diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 89e45595f..ad07746b8 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -6325,7 +6325,7 @@ DEFUN(logging_fltr_imsi, static void dump_one_sub(struct vty *vty, struct bsc_subscr *bsub) { - vty_out(vty, " %15s %08x %5u %d%s", bsub->imsi, bsub->tmsi, bsub->lac, bsub->use_count, + vty_out(vty, " %15s %08x %d%s", bsub->imsi, bsub->tmsi, bsub->use_count, VTY_NEWLINE); } @@ -6336,8 +6336,8 @@ DEFUN(show_subscr_all, { struct bsc_subscr *bsc_subscr; - vty_out(vty, " IMSI TMSI LAC Use%s", VTY_NEWLINE); - /* " 001010123456789 ffffffff 65534 1" */ + vty_out(vty, " IMSI TMSI Use%s", VTY_NEWLINE); + /* " 001010123456789 ffffffff 1" */ llist_for_each_entry(bsc_subscr, bsc_gsmnet->bsc_subscribers, entry) dump_one_sub(vty, bsc_subscr); diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 14cd2c03e..2a199c4e1 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -140,7 +140,6 @@ page_subscriber(struct bsc_msc_data *msc, struct gsm_bts *bts, return; } - subscr->lac = lac; subscr->tmsi = tmsi; ret = paging_request_bts(bts, subscr, chan_needed, msc); -- cgit v1.2.3