summaryrefslogtreecommitdiffstats
path: root/openbsc/src/libmsc/gsm_04_11.c
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2012-11-24 17:13:56 +0100
committerHolger Hans Peter Freyther <zecke@selfish.org>2012-12-01 11:49:33 +0100
commit536a10b63ba3cbade1ff3808ae056b11a279aaef (patch)
tree6ff6f7ee6f397f57fd5bd30492c07375ac4eae20 /openbsc/src/libmsc/gsm_04_11.c
parentbc6c43f7595ce379b8b754df1321b852b9a20fee (diff)
sms: Kill the linkid as we are using SAPI=3 all the time
For GSM (not GPRS) we will never use a SAPI!=3. Simplify the code and remove the link_id=0.
Diffstat (limited to 'openbsc/src/libmsc/gsm_04_11.c')
-rw-r--r--openbsc/src/libmsc/gsm_04_11.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/openbsc/src/libmsc/gsm_04_11.c b/openbsc/src/libmsc/gsm_04_11.c
index b9f2ff605..46bb074c4 100644
--- a/openbsc/src/libmsc/gsm_04_11.c
+++ b/openbsc/src/libmsc/gsm_04_11.c
@@ -122,11 +122,11 @@ static void send_signal(int sig_no,
osmo_signal_dispatch(SS_SMS, sig_no, &sig);
}
-static int gsm411_sendmsg(struct gsm_subscriber_connection *conn, struct msgb *msg, uint8_t link_id)
+static int gsm411_sendmsg(struct gsm_subscriber_connection *conn, struct msgb *msg)
{
DEBUGP(DLSMS, "GSM4.11 TX %s\n", osmo_hexdump(msg->data, msg->len));
msg->l3h = msg->data;
- return gsm0808_submit_dtap(conn, msg, link_id, 1);
+ return gsm0808_submit_dtap(conn, msg, UM_SAPI_SMS, 1);
}
/* Prefix msg with a 04.08/04.11 CP header */
@@ -142,7 +142,7 @@ static int gsm411_cp_sendmsg(struct msgb *msg, struct gsm_trans *trans,
DEBUGP(DLSMS, "sending CP message (trans=%x)\n", trans->transaction_id);
- return gsm411_sendmsg(trans->conn, msg, trans->sms.link_id);
+ return gsm411_sendmsg(trans->conn, msg);
}
/* mm_send: receive MMCCSMS sap message from SMC */
@@ -774,7 +774,6 @@ int gsm0411_rcv_sms(struct gsm_subscriber_connection *conn,
gsm411_mn_recv, gsm411_mm_send);
gsm411_smr_init(&trans->sms.smr_inst, 0, 1,
gsm411_rl_recv, gsm411_mn_send);
- trans->sms.link_id = UM_SAPI_SMS;
trans->conn = conn;
@@ -851,7 +850,6 @@ int gsm411_send_sms(struct gsm_subscriber_connection *conn, struct gsm_sms *sms)
gsm411_smr_init(&trans->sms.smr_inst, sms->id, 1,
gsm411_rl_recv, gsm411_mn_send);
trans->sms.sms = sms;
- trans->sms.link_id = UM_SAPI_SMS; /* FIXME: main or SACCH ? */
trans->conn = conn;