diff options
| author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2013-10-26 19:43:50 +0200 |
|---|---|---|
| committer | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2013-10-30 21:24:11 +0100 |
| commit | 7292373f922da0561808a3dbdeef2710c7181c97 (patch) | |
| tree | 3d0891a95b3fb1a8ba0a21a07330cfc684438c33 | |
| parent | 70ddde6929a0fe24b509da6a621ca138daefa9a3 (diff) | |
tbf: kill the indirection and invoke the right method
| -rw-r--r-- | src/gprs_rlcmac_data.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/gprs_rlcmac_data.cpp b/src/gprs_rlcmac_data.cpp index a9720ca2..7e4ee132 100644 --- a/src/gprs_rlcmac_data.cpp +++ b/src/gprs_rlcmac_data.cpp @@ -50,11 +50,6 @@ static void gprs_rlcmac_downlink_assignment( gprs_rlcmac_tbf *tbf, uint8_t poll, const char *imsi); -static int gprs_rlcmac_diag(struct gprs_rlcmac_tbf *tbf) -{ - return tbf->rlcmac_diag(); -} - int gprs_rlcmac_poll_timeout(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf *tbf) { LOGP(DRLCMAC, LOGL_NOTICE, "Poll timeout for %s TBF=%d\n", @@ -66,7 +61,7 @@ int gprs_rlcmac_poll_timeout(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf if (!(tbf->state_flags & (1 << GPRS_RLCMAC_FLAG_TO_UL_ACK))) { LOGP(DRLCMAC, LOGL_NOTICE, "- Timeout for polling " "PACKET CONTROL ACK for PACKET UPLINK ACK\n"); - gprs_rlcmac_diag(tbf); + tbf->rlcmac_diag(); tbf->state_flags |= (1 << GPRS_RLCMAC_FLAG_TO_UL_ACK); } tbf->ul_ack_state = GPRS_RLCMAC_UL_ACK_NONE; @@ -90,7 +85,7 @@ int gprs_rlcmac_poll_timeout(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf LOGP(DRLCMAC, LOGL_NOTICE, "- Timeout for polling " "PACKET CONTROL ACK for PACKET UPLINK " "ASSIGNMENT.\n"); - gprs_rlcmac_diag(tbf); + tbf->rlcmac_diag(); tbf->state_flags |= (1 << GPRS_RLCMAC_FLAG_TO_UL_ASS); } tbf->ul_ass_state = GPRS_RLCMAC_UL_ASS_NONE; @@ -111,7 +106,7 @@ int gprs_rlcmac_poll_timeout(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf LOGP(DRLCMAC, LOGL_NOTICE, "- Timeout for polling " "PACKET CONTROL ACK for PACKET DOWNLINK " "ASSIGNMENT.\n"); - gprs_rlcmac_diag(tbf); + tbf->rlcmac_diag(); tbf->state_flags |= (1 << GPRS_RLCMAC_FLAG_TO_DL_ASS); } tbf->dl_ass_state = GPRS_RLCMAC_DL_ASS_NONE; @@ -131,7 +126,7 @@ int gprs_rlcmac_poll_timeout(struct gprs_rlcmac_bts *bts, struct gprs_rlcmac_tbf if (!(tbf->state_flags & (1 << GPRS_RLCMAC_FLAG_TO_DL_ACK))) { LOGP(DRLCMAC, LOGL_NOTICE, "- Timeout for polling " "PACKET DOWNLINK ACK.\n"); - gprs_rlcmac_diag(tbf); + tbf->rlcmac_diag(); tbf->state_flags |= (1 << GPRS_RLCMAC_FLAG_TO_DL_ACK); } debug_diagram(bts->bts, tbf->diag, "timeout DL-ACK"); |