aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2011-01-20 19:00:44 +0100
committerHolger Hans Peter Freyther <zecke@selfish.org>2011-01-20 19:07:16 +0100
commit95057b923710b3d1b4109f36ebed24011b294d97 (patch)
treeb07798d1d3659e7766894bf1fb2339f6b1cf1faa
parent1cc24561b0b6182da55461ec4305e76c525d5a96 (diff)
mtp: Send the SLTM/SLTA on the link directly
For both the SLTM that the app is sending and the SLTM we are receiving we don't want to go through the SLC.
-rw-r--r--include/mtp_data.h1
-rw-r--r--src/mtp_layer3.c7
-rw-r--r--src/mtp_link.c2
3 files changed, 2 insertions, 8 deletions
diff --git a/include/mtp_data.h b/include/mtp_data.h
index a414a63..f04c07d 100644
--- a/include/mtp_data.h
+++ b/include/mtp_data.h
@@ -134,6 +134,5 @@ void mtp_link_failure(struct mtp_link *fail);
/* internal routines */
struct msgb *mtp_msg_alloc(struct mtp_link_set *link);
-void mtp_link_set_trasmit(struct mtp_link *link, int sls, struct msgb *msg);
#endif
diff --git a/src/mtp_layer3.c b/src/mtp_layer3.c
index b3be449..4f6fa87 100644
--- a/src/mtp_layer3.c
+++ b/src/mtp_layer3.c
@@ -352,7 +352,7 @@ static int mtp_link_regular_msg(struct mtp_link *link, struct mtp_level_3_hdr *h
out = mtp_create_slta(link->set, mng, l3_len);
if (!out)
return -1;
- mtp_link_set_submit(link->set->slc[0], out);
+ mtp_link_set_submit(link, out);
return 0;
break;
case MTP_TST_MSG_SLTA:
@@ -516,11 +516,6 @@ static int mtp_int_submit(struct mtp_link_set *link, int pc, int sls, int type,
return 0;
}
-void mtp_link_set_trasmit(struct mtp_link *link, int sls, struct msgb *msg)
-{
- return mtp_link_set_submit(link->set->slc[sls % 16], msg);
-}
-
static struct mtp_link *find_next_link(struct mtp_link_set *set,
struct mtp_link *data)
{
diff --git a/src/mtp_link.c b/src/mtp_link.c
index 5423b33..efd49c9 100644
--- a/src/mtp_link.c
+++ b/src/mtp_link.c
@@ -63,7 +63,7 @@ static void mtp_send_sltm(struct mtp_link *link)
return;
}
- mtp_link_set_trasmit(link, 0, msg);
+ link->write(link, msg);
}
static void mtp_sltm_t1_timeout(void *_link)