[PATCH] openbsc[master]: [RFC] libbsc: skip channel state LCHAN_S_INACTIVE while hand...

[lynxis lazus]

Review at  https://gerrit.osmocom.org/456

[RFC] libbsc: skip channel state LCHAN_S_INACTIVE while handover

The state is directly overwritten by the next function. Because
there isn't any state transition, remove this state.

Change-Id: I7f287692dbd559268fb5e61d81ac19e5dd4827eb
---
M openbsc/include/openbsc/gsm_data_shared.h
M openbsc/src/libbsc/handover_logic.c
M openbsc/src/libcommon/gsm_data_shared.c
3 files changed, 0 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/56/456/1

diff --git a/openbsc/include/openbsc/gsm_data_shared.h b/openbsc/include/openbsc/gsm_data_shared.h
index d3a61af..b0ae152 100644
--- a/openbsc/include/openbsc/gsm_data_shared.h
+++ b/openbsc/include/openbsc/gsm_data_shared.h
@@ -121,7 +121,6 @@
 	LCHAN_S_REL_REQ,	/* channel release has been requested */
 	LCHAN_S_REL_ERR,	/* channel is in an error state */
 	LCHAN_S_BROKEN,		/* channel is somehow unusable */
-	LCHAN_S_INACTIVE,	/* channel is set inactive */
 };
 
 /* BTS ONLY */
diff --git a/openbsc/src/libbsc/handover_logic.c b/openbsc/src/libbsc/handover_logic.c
index 56b623a..52fa4af 100644
--- a/openbsc/src/libbsc/handover_logic.c
+++ b/openbsc/src/libbsc/handover_logic.c
@@ -284,7 +284,6 @@
 	new_lchan->conn->lchan = new_lchan;
 	ho->old_lchan->conn = NULL;
 
-	rsl_lchan_set_state(ho->old_lchan, LCHAN_S_INACTIVE);
 	lchan_release(ho->old_lchan, 0, RSL_REL_LOCAL_END);
 
 	handover_free(ho);
diff --git a/openbsc/src/libcommon/gsm_data_shared.c b/openbsc/src/libcommon/gsm_data_shared.c
index e9eb4b0..a569314 100644
--- a/openbsc/src/libcommon/gsm_data_shared.c
+++ b/openbsc/src/libcommon/gsm_data_shared.c
@@ -102,7 +102,6 @@
 	{ LCHAN_S_NONE,		"NONE" },
 	{ LCHAN_S_ACT_REQ,	"ACTIVATION REQUESTED" },
 	{ LCHAN_S_ACTIVE,	"ACTIVE" },
-	{ LCHAN_S_INACTIVE,	"INACTIVE" },
 	{ LCHAN_S_REL_REQ,	"RELEASE REQUESTED" },
 	{ LCHAN_S_REL_ERR,	"RELEASE DUE ERROR" },
 	{ LCHAN_S_BROKEN,	"BROKEN UNUSABLE" },

-- 
To view, visit https://gerrit.osmocom.org/456
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f287692dbd559268fb5e61d81ac19e5dd4827eb
Gerrit-PatchSet: 1
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus <lynxis at fe80.eu>