diff --git a/[refs] b/[refs] index afce0e37e166..38e77b239b62 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 542c2d832087aa78566be49aa4284779a0a687b3 +refs/heads/master: ee16371e6c737684215ee10b4b9756b610d81272 diff --git a/trunk/include/net/sctp/structs.h b/trunk/include/net/sctp/structs.h index 3c1bb8dd1e26..125a19c73531 100644 --- a/trunk/include/net/sctp/structs.h +++ b/trunk/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/trunk/net/sctp/inqueue.c b/trunk/net/sctp/inqueue.c index 2d5ad280de38..3221d073448c 100644 --- a/trunk/net/sctp/inqueue.c +++ b/trunk/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.