From 95129bbba74145f0290509870f67ecfda0ad4b84 Mon Sep 17 00:00:00 2001
From: Daniel Borkmann <dborkman@redhat.com>
Date: Thu, 18 Apr 2013 21:59:37 +0000
Subject: [PATCH] --- yaml --- r: 369375 b: refs/heads/master c:
 3e3251b3f289528732edab386ddf73ac428359b7 h: refs/heads/master i:   369373:
 2f0b879113fc393e6fae9970e64301c674d08982   369371:
 80473b3a99117afd3a166bc391c61db6005ef379   369367:
 5cc3ebdaef3dd00531ed1d37d47259ea94fc3c94   369359:
 f2d9ea9c406249c454f55e203d69ed683ab92ea1   369343:
 9bc9783ce84145b4c94bee1e90b665fec36d9fdd v: v3

---
 [refs]                           | 2 +-
 trunk/include/net/sctp/structs.h | 3 +--
 trunk/net/sctp/output.c          | 5 +----
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 975203694767..3f9bba55fe66 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae8840825605f36f98f247323edc150e761cb64e
+refs/heads/master: 3e3251b3f289528732edab386ddf73ac428359b7
diff --git a/trunk/include/net/sctp/structs.h b/trunk/include/net/sctp/structs.h
index 64d469845f25..1bd4c4144fe8 100644
--- a/trunk/include/net/sctp/structs.h
+++ b/trunk/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/trunk/net/sctp/output.c b/trunk/net/sctp/output.c
index f5200a2ad852..bbef4a7a9b56 100644
--- a/trunk/net/sctp/output.c
+++ b/trunk/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