Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / net / sctp / inqueue.c

diff --git a/net/sctp/inqueue.c b/net/sctp/inqueue.c
index 2d5ad280de388d07f3949a578ce6bbdf9cf6ae5f..3221d073448ce0356ac24078a3f69c6501e91371 100644 (file)
--- a/net/sctp/inqueue.c
+++ b/net/sctp/inqueue.c
@@ -58,8 +58,6 @@ void sctp_inq_init(struct sctp_inq *queue)
 
        /* Create a task for delivering data.  */
        INIT_WORK(&queue->immediate, NULL);
-
-       queue->malloced = 0;
 }
 
 /* Release the memory associated with an SCTP inqueue.  */
@@ -80,11 +78,6 @@ void sctp_inq_free(struct sctp_inq *queue)
                sctp_chunk_free(queue->in_progress);
                queue->in_progress = NULL;
        }
-
-       if (queue->malloced) {
-               /* Dump the master memory segment.  */
-               kfree(queue);
-       }
 }
 
 /* Put a new packet in an SCTP inqueue.