diff options
| author |   Daniel Borkmann <dborkman@redhat.com> | 2013-04-16 11:07:17 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-04-17 14:13:02 -0400 |
| commit | c1db7a26ac3f7223a38eaeb46a77d0cf9e6a0d8f (patch) | |
| tree | 458dceabab609cc738af0b5f58227806eff47288 | |
| parent | net: sctp: sctp_bind_addr: remove dead code (diff) | |
| download | linux-dev-c1db7a26ac3f7223a38eaeb46a77d0cf9e6a0d8f.tar.xz linux-dev-c1db7a26ac3f7223a38eaeb46a77d0cf9e6a0d8f.zip | |
net: sctp: sctp_ulpq: remove 'malloced' struct member
The structure sctp_ulpq is embedded into sctp_association and never
separately allocated, also ulpq->malloced is always 0, so that
kfree() is never called. Therefore, remove this 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/ulpqueue.h | 1 | ||||
| -rw-r--r-- | net/sctp/ulpqueue.c | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/include/net/sctp/ulpqueue.h b/include/net/sctp/ulpqueue.h index ff1b8ba73ab1..00e50ba3f24b 100644 --- a/include/net/sctp/ulpqueue.h +++ b/include/net/sctp/ulpqueue.h @@ -49,7 +49,6 @@ /* A structure to carry information to the ULP (e.g. Sockets API) */ struct sctp_ulpq { - char malloced; char pd_mode; struct sctp_association *asoc; struct sk_buff_head reasm; diff --git a/net/sctp/ulpqueue.c b/net/sctp/ulpqueue.c index 0fd5b3d2df03..04e3d470f877 100644 --- a/net/sctp/ulpqueue.c +++ b/net/sctp/ulpqueue.c @@ -68,7 +68,6 @@ struct sctp_ulpq *sctp_ulpq_init(struct sctp_ulpq *ulpq, skb_queue_head_init(&ulpq->reasm); skb_queue_head_init(&ulpq->lobby); ulpq->pd_mode = 0; - ulpq->malloced = 0; return ulpq; } @@ -96,8 +95,6 @@ void sctp_ulpq_flush(struct sctp_ulpq *ulpq) void sctp_ulpq_free(struct sctp_ulpq *ulpq) { sctp_ulpq_flush(ulpq); - if (ulpq->malloced) - kfree(ulpq); } /* Process an incoming DATA chunk. */ |