diff options
Diffstat (limited to 'src/common/load_indication.c')
| -rw-r--r-- | src/common/load_indication.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/common/load_indication.c b/src/common/load_indication.c index fa4745b1..c0d6efb1 100644 --- a/src/common/load_indication.c +++ b/src/common/load_indication.c @@ -12,7 +12,7 @@ * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * GNU Affero General Public License for more details. * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. @@ -27,6 +27,7 @@ #include <osmo-bts/gsm_data.h> #include <osmo-bts/rsl.h> #include <osmo-bts/paging.h> +#include <osmo-bts/bts.h> static void reset_load_counters(struct gsm_bts *bts) { @@ -40,6 +41,10 @@ static void load_timer_cb(void *data) struct gsm_bts *bts = data; unsigned int pch_percent, rach_percent; + /* It makes no sense to send Load Indication if CCCH is still disabled...*/ + if (bts->c0->ts[0].mo.nm_state.operational != NM_OPSTATE_ENABLED) + goto retry_later; + /* compute percentages */ if (bts->load.ccch.pch_total == 0) pch_percent = 0; @@ -52,7 +57,7 @@ static void load_timer_cb(void *data) uint16_t buffer_space = paging_buffer_space(bts->paging_state); rsl_tx_ccch_load_ind_pch(bts, buffer_space); } else { - /* This is an extenstion of TS 08.58. We don't only + /* This is an extension of TS 08.58. We don't only * send load indications if the load is above threshold, * but we also explicitly indicate that we are below * threshold by using the magic value 0xffff */ @@ -72,6 +77,7 @@ static void load_timer_cb(void *data) bts->load.rach.access); } +retry_later: reset_load_counters(bts); /* re-schedule the timer */ @@ -93,3 +99,8 @@ void load_timer_stop(struct gsm_bts *bts) { osmo_timer_del(&bts->load.ccch.timer); } + +bool load_timer_is_running(const struct gsm_bts *bts) +{ + return osmo_timer_pending(&bts->load.ccch.timer); +} |