summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorHarald Welte2011-06-24 15:57:59 +0200
committerHarald Welte2011-06-24 15:57:59 +0200
commit50c035c30906295b9ca9031a065b7a06776c8196 (patch)
treeb10807912d7ac1831ff2305ecc26682fd8aa1a7a /src
parentlapdm: some more error reporting in case strange primitives arrive from L1 (diff)
downloadosmocom-50c035c30906295b9ca9031a065b7a06776c8196.tar.gz
osmocom-50c035c30906295b9ca9031a065b7a06776c8196.tar.xz
osmocom-50c035c30906295b9ca9031a065b7a06776c8196.zip
lapdm: Don't try to send data using a PH-RACH.req, use PH-DATA.req
Diffstat (limited to 'src')
-rw-r--r--src/host/layer23/src/common/lapdm.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/host/layer23/src/common/lapdm.c b/src/host/layer23/src/common/lapdm.c
index 1d0a80a..e5e23f3 100644
--- a/src/host/layer23/src/common/lapdm.c
+++ b/src/host/layer23/src/common/lapdm.c
@@ -310,11 +310,6 @@ static int tx_ph_data_enqueue(struct lapdm_datalink *dl, struct msgb *msg,
struct lapdm_entity *le = dl->entity;
struct osmo_phsap_prim pp;
- osmo_prim_init(&pp.oph, SAP_GSM_PH, PRIM_PH_RACH,
- PRIM_OP_REQUEST, msg);
- pp.u.data.chan_nr = chan_nr;
- pp.u.data.link_id = link_id;
-
/* if there is a pending message, queue it */
if (le->tx_pending || le->flags & LAPDM_ENT_F_POLLING_ONLY) {
*msgb_push(msg, 1) = n201;
@@ -324,6 +319,11 @@ static int tx_ph_data_enqueue(struct lapdm_datalink *dl, struct msgb *msg,
return -EBUSY;
}
+ osmo_prim_init(&pp.oph, SAP_GSM_PH, PRIM_PH_DATA,
+ PRIM_OP_REQUEST, msg);
+ pp.u.data.chan_nr = chan_nr;
+ pp.u.data.link_id = link_id;
+
/* send the frame now */
le->tx_pending = 0; /* disabled flow control */
lapdm_pad_msgb(msg, n201);