diff options
| author | Daniel Borkmann | 2013-04-16 13:07:12 +0200 |
|---|---|---|
| committer | David S. Miller | 2013-04-17 20:13:02 +0200 |
| commit | 165a4c31278c980862b2c2ddec408cf30341f3ec (patch) | |
| tree | 556c9b4284952643f7f184088c9fe997ccc37eda | |
| parent | net: sctp: sctp_inq: remove dead code (diff) | |
| download | kernel-qcow2-linux-165a4c31278c980862b2c2ddec408cf30341f3ec.tar.gz kernel-qcow2-linux-165a4c31278c980862b2c2ddec408cf30341f3ec.tar.xz kernel-qcow2-linux-165a4c31278c980862b2c2ddec408cf30341f3ec.zip | |
net: sctp: sctp_outq: remove 'malloced' from its struct
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 <dborkman@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/net/sctp/structs.h | 3 | ||||
| -rw-r--r-- | net/sctp/outqueue.c | 6 |
2 files changed, 0 insertions, 9 deletions
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h index 125a19c73531..73fd5de4d4cc 100644 --- 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 index 01dca753db16..d4c137e1ab85 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) 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. */ |