From: Daniel Borkmann <dborkman@redhat.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, linux-sctp@vger.kernel.org
Subject: [PATCH net-next 2/9] net: sctp: sctp_inq: remove dead code
Date: Tue, 16 Apr 2013 23:07:11 +0200 [thread overview]
Message-ID: <1366146438-8815-3-git-send-email-dborkman@redhat.com> (raw)
In-Reply-To: <1366146438-8815-1-git-send-email-dborkman@redhat.com>
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>
---
include/net/sctp/structs.h | 2 --
net/sctp/inqueue.c | 7 -------
2 files changed, 9 deletions(-)
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index 3c1bb8d..125a19c 100644
--- 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 2d5ad28..3221d07 100644
--- 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.
--
1.7.11.7
next prev parent reply other threads:[~2013-04-16 21:07 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-16 21:07 [PATCH net-next 0/9] Minor SCTP cleanups all over the place Daniel Borkmann
2013-04-16 21:07 ` [PATCH net-next 1/9] net: sctp: sctp_ssnmap: remove 'malloced' element from struct Daniel Borkmann
2013-04-17 12:45 ` Neil Horman
2013-04-17 12:52 ` Daniel Borkmann
2013-04-17 17:17 ` Daniel Borkmann
2013-04-17 19:18 ` Neil Horman
2013-04-16 21:07 ` Daniel Borkmann [this message]
2013-04-17 12:47 ` [PATCH net-next 2/9] net: sctp: sctp_inq: remove dead code Neil Horman
2013-04-16 21:07 ` [PATCH net-next 3/9] net: sctp: sctp_outq: remove 'malloced' from its struct Daniel Borkmann
2013-04-17 12:57 ` Neil Horman
2013-04-16 21:07 ` [PATCH net-next 4/9] net: sctp: sctp_outq: consolidate chars into bitfield Daniel Borkmann
2013-04-17 8:43 ` David Laight
2013-04-17 9:26 ` Daniel Borkmann
2013-04-17 15:27 ` Neil Horman
2013-04-17 15:35 ` Vlad Yasevich
2013-04-17 15:40 ` Neil Horman
2013-04-17 15:38 ` Daniel Borkmann
2013-04-17 15:44 ` Vlad Yasevich
2013-04-17 15:31 ` Neil Horman
2013-04-16 21:07 ` [PATCH net-next 5/9] net: sctp: outqueue: simplify sctp_outq_uncork function Daniel Borkmann
2013-04-17 15:32 ` Neil Horman
2013-04-16 21:07 ` [PATCH net-next 6/9] net: sctp: sctp_transport: remove unused variable Daniel Borkmann
2013-04-17 15:34 ` Neil Horman
2013-04-16 21:07 ` [PATCH net-next 7/9] net: sctp: sctp_bind_addr: remove dead code Daniel Borkmann
2013-04-17 15:35 ` Neil Horman
2013-04-16 21:07 ` [PATCH net-next 8/9] net: sctp: sctp_ulpq: remove 'malloced' struct member Daniel Borkmann
2013-04-17 15:46 ` Neil Horman
2013-04-16 21:07 ` [PATCH net-next 9/9] net: sctp: sctp_ulpq: do not use char as a " Daniel Borkmann
2013-04-17 15:36 ` Vlad Yasevich
2013-04-17 15:41 ` Daniel Borkmann
2013-04-17 15:45 ` Neil Horman
2013-04-17 16:28 ` David Laight
2013-04-17 18:13 ` [PATCH net-next 0/9] Minor SCTP cleanups all over the place David Miller
2013-04-17 18:55 ` Daniel Borkmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1366146438-8815-3-git-send-email-dborkman@redhat.com \
--to=dborkman@redhat.com \
--cc=davem@davemloft.net \
--cc=linux-sctp@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).