summaryrefslogtreecommitdiffstats
path: root/net/sctp
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2008-03-23 22:47:08 -0700
committerDavid S. Miller <davem@davemloft.net>2008-03-23 22:47:08 -0700
commit80445cfb28a6b093540582b68d9ae928bf34cfe7 (patch)
tree67b3cdcc8af6b7f74c82d70727880f0571f8ecba /net/sctp
parent2444844cefd2ce0ac73858cf980de07e33a5dd20 (diff)
downloadop-kernel-dev-80445cfb28a6b093540582b68d9ae928bf34cfe7.zip
op-kernel-dev-80445cfb28a6b093540582b68d9ae928bf34cfe7.tar.gz
[SCTP]: Remove redundant wrapper functions.
sctp_datamsg_free and sctp_datamsg_track are just aliases for sctp_datamsg_put and sctp_chunk_hold, respectively. Saves 32 Bytes on x86. Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp')
-rw-r--r--net/sctp/chunk.c16
-rw-r--r--net/sctp/socket.c4
2 files changed, 3 insertions, 17 deletions
diff --git a/net/sctp/chunk.c b/net/sctp/chunk.c
index e1f3550..ed85764 100644
--- a/net/sctp/chunk.c
+++ b/net/sctp/chunk.c
@@ -136,20 +136,6 @@ void sctp_datamsg_put(struct sctp_datamsg *msg)
sctp_datamsg_destroy(msg);
}
-/* Free a message. Really just give up a reference, the
- * really free happens in sctp_datamsg_destroy().
- */
-void sctp_datamsg_free(struct sctp_datamsg *msg)
-{
- sctp_datamsg_put(msg);
-}
-
-/* Hold on to all the fragments until all chunks have been sent. */
-void sctp_datamsg_track(struct sctp_chunk *chunk)
-{
- sctp_chunk_hold(chunk);
-}
-
/* Assign a chunk to this datamsg. */
static void sctp_datamsg_assign(struct sctp_datamsg *msg, struct sctp_chunk *chunk)
{
@@ -295,7 +281,7 @@ errout:
chunk = list_entry(pos, struct sctp_chunk, frag_list);
sctp_chunk_free(chunk);
}
- sctp_datamsg_free(msg);
+ sctp_datamsg_put(msg);
return NULL;
}
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index a3138a0..76c7470 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -1729,7 +1729,7 @@ SCTP_STATIC int sctp_sendmsg(struct kiocb *iocb, struct sock *sk,
/* Now send the (possibly) fragmented message. */
list_for_each(pos, &datamsg->chunks) {
chunk = list_entry(pos, struct sctp_chunk, frag_list);
- sctp_datamsg_track(chunk);
+ sctp_chunk_hold(chunk);
/* Do accounting for the write space. */
sctp_set_owner_w(chunk);
@@ -1748,7 +1748,7 @@ SCTP_STATIC int sctp_sendmsg(struct kiocb *iocb, struct sock *sk,
SCTP_DEBUG_PRINTK("We sent primitively.\n");
}
- sctp_datamsg_free(datamsg);
+ sctp_datamsg_put(datamsg);
if (err)
goto out_free;
else
OpenPOWER on IntegriCloud