From f6d0e06940d6430ef58ecd095702e8d1d323d605 Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Thu, 17 Jun 2010 17:48:13 +0800
Subject: [PATCH] bsc_api: Set the l3h header from within the dtap method

This is fixing USSD which broke when the code was
switched to use the BSC API.
---
 openbsc/src/bsc_api.c   | 1 +
 openbsc/src/gsm_04_08.c | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/openbsc/src/bsc_api.c b/openbsc/src/bsc_api.c
index 02fc47309..cac08be09 100644
--- a/openbsc/src/bsc_api.c
+++ b/openbsc/src/bsc_api.c
@@ -47,6 +47,7 @@ int gsm0808_submit_dtap(struct gsm_subscriber_connection *conn,
 	msg->lchan = conn->lchan;
 	msg->trx = msg->lchan->ts->trx;
 
+	msg->l3h = msg->data;
 	if (conn->lchan->sapis[sapi] == LCHAN_SAPI_UNUSED) {
 		OBSC_LINKID_CB(msg) = link_id;
 		if (rll_establish(msg->lchan, sapi, rll_ind_cb, msg) != 0) {
diff --git a/openbsc/src/gsm_04_08.c b/openbsc/src/gsm_04_08.c
index f87406aed..e76a63a5a 100644
--- a/openbsc/src/gsm_04_08.c
+++ b/openbsc/src/gsm_04_08.c
@@ -99,7 +99,6 @@ static int gsm48_conn_sendmsg(struct msgb *msg, struct gsm_subscriber_connection
 				gh->proto_discr, gh->msg_type);
 	}
 
-	msg->l3h = msg->data;
 	return gsm0808_submit_dtap(conn, msg, 0);
 }