aboutsummaryrefslogtreecommitdiffstats
path: root/net/sctp/outqueue.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/sctp/outqueue.c')
-rw-r--r--net/sctp/outqueue.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/net/sctp/outqueue.c b/net/sctp/outqueue.c
index 01dca753db16..32a4625fef77 100644
--- a/net/sctp/outqueue.c
+++ b/net/sctp/outqueue.c
@@ -217,8 +217,6 @@ void sctp_outq_init(struct sctp_association *asoc, struct sctp_outq *q)
217 q->outstanding_bytes = 0; 217 q->outstanding_bytes = 0;
218 q->empty = 1; 218 q->empty = 1;
219 q->cork = 0; 219 q->cork = 0;
220
221 q->malloced = 0;
222 q->out_qlen = 0; 220 q->out_qlen = 0;
223} 221}
224 222
@@ -295,10 +293,6 @@ void sctp_outq_free(struct sctp_outq *q)
295{ 293{
296 /* Throw away leftover chunks. */ 294 /* Throw away leftover chunks. */
297 __sctp_outq_teardown(q); 295 __sctp_outq_teardown(q);
298
299 /* If we were kmalloc()'d, free the memory. */
300 if (q->malloced)
301 kfree(q);
302} 296}
303 297
304/* Put a new chunk in an sctp_outq. */ 298/* Put a new chunk in an sctp_outq. */
@@ -707,11 +701,10 @@ redo:
707/* Cork the outqueue so queued chunks are really queued. */ 701/* Cork the outqueue so queued chunks are really queued. */
708int sctp_outq_uncork(struct sctp_outq *q) 702int sctp_outq_uncork(struct sctp_outq *q)
709{ 703{
710 int error = 0;
711 if (q->cork) 704 if (q->cork)
712 q->cork = 0; 705 q->cork = 0;
713 error = sctp_outq_flush(q, 0); 706
714 return error; 707 return sctp_outq_flush(q, 0);
715} 708}
716 709
717 710