Patchwork [net-next] net: sctp: minor: remove dead code from sctp_packet

login
register
mail settings
Submitter Daniel Borkmann
Date April 19, 2013, 7:59 a.m.
Message ID <1366358377-7623-1-git-send-email-dborkman@redhat.com>
Download mbox | patch
Permalink /patch/237867/
State Accepted
Delegated to: David Miller
Headers show

Comments

Daniel Borkmann - April 19, 2013, 7:59 a.m.
struct sctp_packet is currently embedded into sctp_transport or
sits on the stack as 'singleton' in sctp_outq_flush(). Therefore,
its member 'malloced' is always 0, thus a kfree() is never called.
Because of that, we can just remove this code.

Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
---
 That is finally the last one of all these cases to get rid of
 'malloced' structure members.

 include/net/sctp/structs.h | 3 +--
 net/sctp/output.c          | 5 +----
 2 files changed, 2 insertions(+), 6 deletions(-)
David Miller - April 22, 2013, 8:25 p.m.
From: Daniel Borkmann <dborkman@redhat.com>
Date: Fri, 19 Apr 2013 09:59:37 +0200

> struct sctp_packet is currently embedded into sctp_transport or
> sits on the stack as 'singleton' in sctp_outq_flush(). Therefore,
> its member 'malloced' is always 0, thus a kfree() is never called.
> Because of that, we can just remove this code.
> 
> Signed-off-by: Daniel Borkmann <dborkman@redhat.com>

Applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
index 64d4698..1bd4c41 100644
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
@@ -714,8 +714,7 @@  struct sctp_packet {
 	    has_sack:1,		/* This packet contains a SACK chunk. */
 	    has_auth:1,		/* This packet contains an AUTH chunk */
 	    has_data:1,		/* This packet contains at least 1 DATA chunk */
-	    ipfragok:1,		/* So let ip fragment this packet */
-	    malloced:1;		/* Is it malloced? */
+	    ipfragok:1;		/* So let ip fragment this packet */
 };
 
 struct sctp_packet *sctp_packet_init(struct sctp_packet *,
diff --git a/net/sctp/output.c b/net/sctp/output.c
index f5200a2..bbef4a7 100644
--- a/net/sctp/output.c
+++ b/net/sctp/output.c
@@ -136,7 +136,7 @@  struct sctp_packet *sctp_packet_init(struct sctp_packet *packet,
 	packet->overhead = overhead;
 	sctp_packet_reset(packet);
 	packet->vtag = 0;
-	packet->malloced = 0;
+
 	return packet;
 }
 
@@ -151,9 +151,6 @@  void sctp_packet_free(struct sctp_packet *packet)
 		list_del_init(&chunk->list);
 		sctp_chunk_free(chunk);
 	}
-
-	if (packet->malloced)
-		kfree(packet);
 }
 
 /* This routine tries to append the chunk to the offered packet. If adding