net: sctp: sctp_outq: remove 'malloced' from its struct

Daniel Borkmann · davem330 · commit 165a4c31278c · 2013-04-17T14:13:02.000-04:00
sctp_outq is embedded into sctp_association, and thus never
kmalloced in any way. Also, malloced is always 0, thus kfree()
is never called. Therefore, remove that dead piece of code.

Signed-off-by: Daniel Borkmann &lt;dborkman@redhat.com&gt;
Acked-by: Neil Horman &lt;nhorman@tuxdriver.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
@@ -1059,9 +1059,6 @@ struct sctp_outq {
 
 	/* Is this structure empty?  */
 	char empty;
-
-	/* Are we kfree()able? */
-	char malloced;
 };
 
 void sctp_outq_init(struct sctp_association *, struct sctp_outq *);
diff --git 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)
 	q->outstanding_bytes = 0;
 	q->empty = 1;
 	q->cork  = 0;
-
-	q->malloced = 0;
 	q->out_qlen = 0;
 }
 
@@ -295,10 +293,6 @@ void sctp_outq_free(struct sctp_outq *q)
 {
 	/* Throw away leftover chunks. */
 	__sctp_outq_teardown(q);
-
-	/* If we were kmalloc()'d, free the memory.  */
-	if (q->malloced)
-		kfree(q);
 }
 
 /* Put a new chunk in an sctp_outq.  */

Original file line number	Diff line number	Diff line change
`@@ -217,8 +217,6 @@ void sctp_outq_init(struct sctp_association asoc, struct sctp_outq q)`
`217`	`217`	`q->outstanding_bytes = 0;`
`218`	`218`	`q->empty = 1;`
`219`	`219`	`q->cork = 0;`
`220`		`-`
`221`		`- q->malloced = 0;`
`222`	`220`	`q->out_qlen = 0;`
`223`	`221`	`}`
`224`	`222`
`@@ -295,10 +293,6 @@ void sctp_outq_free(struct sctp_outq *q)`
`295`	`293`	`{`
`296`	`294`	`/* Throw away leftover chunks. */`
`297`	`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`	`298`	`/* Put a new chunk in an sctp_outq. */`