net: sctp: sctp_inq: remove dead code

sctp_inq is never kmalloced, since it's integrated into sctp_ep_common
and only initialized from eps and assocs. Therefore, remove the dead
code from there.

Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index 3c1bb8dd1e26a306de8d6eaf865173da0edb77a4..125a19c73531c87a39ec93a7eecf3627c37986fc 100644 (file)
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -991,8 +991,6 @@ struct sctp_inq {
         * messages.
         */
        struct work_struct immediate;
-
-       int malloced;        /* Is this structure kfree()able?  */
 };
 
 void sctp_inq_init(struct sctp_inq *);

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.