---

yaml --- r: 369375 b: refs/heads/master c: 3e3251b h: refs/heads/master i: 369373: 2f0b879 369371: 80473b3 369367: 5cc3ebd 369359: f2d9ea9 369343: 9bc9783 v: v3
git-mirror · Apr 22, 2013 · 95129bb · 95129bb
1 parent ff68668
commit 95129bb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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