pespin submitted this change.

View Change


Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, approved
rlcmac: tbf_*: Unlink the freeing tbf from its gre

Change-Id: I2079c4440a05f4b44c9b7bece383c69e84198302
---
M src/rlcmac/tbf_dl.c
M src/rlcmac/tbf_ul.c
2 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/src/rlcmac/tbf_dl.c b/src/rlcmac/tbf_dl.c
index 49f8187..7fb4be9 100644
--- a/src/rlcmac/tbf_dl.c
+++ b/src/rlcmac/tbf_dl.c
@@ -64,6 +64,9 @@
if (!dl_tbf)
return;

+ if (dl_tbf->tbf.gre->dl_tbf == dl_tbf)
+ dl_tbf->tbf.gre->dl_tbf = NULL;
+
msgb_free(dl_tbf->llc_rx_msg);
dl_tbf->llc_rx_msg = NULL;

diff --git a/src/rlcmac/tbf_ul.c b/src/rlcmac/tbf_ul.c
index 06daf36..4a6f9ce 100644
--- a/src/rlcmac/tbf_ul.c
+++ b/src/rlcmac/tbf_ul.c
@@ -72,6 +72,9 @@
if (!ul_tbf)
return;

+ if (ul_tbf->tbf.gre->ul_tbf == ul_tbf)
+ ul_tbf->tbf.gre->ul_tbf = NULL;
+
talloc_free(ul_tbf->llc_tx_msg);

gprs_rlcmac_rlc_block_store_free(ul_tbf->blkst);

To view, visit change 31346. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: libosmo-gprs
Gerrit-Branch: master
Gerrit-Change-Id: I2079c4440a05f4b44c9b7bece383c69e84198302
Gerrit-Change-Number: 31346
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-Reviewer: pespin <pespin@sysmocom.de>
Gerrit-MessageType: merged