---

yaml --- r: 369271 b: refs/heads/master c: 50181c0 h: refs/heads/master i: 369269: b0b7946 369267: 28dc67f 369263: b39a1e4 v: v3
git-mirror · Apr 17, 2013 · ac3f9e0 · ac3f9e0
1 parent 50e8242
commit ac3f9e0
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8fa5df6d210a09241876b74d156c57d833dd057b
+refs/heads/master: 50181c07cbde370986c4925b830ca291a2fc31ab
diff --git a/trunk/include/net/sctp/structs.h b/trunk/include/net/sctp/structs.h
@@ -1093,8 +1093,6 @@ struct sctp_bind_addr {
 	 *	peer(s) in INIT and INIT ACK chunks.
 	 */
 	struct list_head address_list;
-
-	int malloced;	     /* Are we kfree()able?  */
 };
 
 void sctp_bind_addr_init(struct sctp_bind_addr *, __u16 port);

diff --git a/trunk/net/sctp/bind_addr.c b/trunk/net/sctp/bind_addr.c
@@ -131,8 +131,6 @@ int sctp_bind_addr_dup(struct sctp_bind_addr *dest,
  */
 void sctp_bind_addr_init(struct sctp_bind_addr *bp, __u16 port)
 {
-	bp->malloced = 0;
-
 	INIT_LIST_HEAD(&bp->address_list);
 	bp->port = port;
 }
@@ -155,11 +153,6 @@ void sctp_bind_addr_free(struct sctp_bind_addr *bp)
 {
 	/* Empty the bind address list. */
 	sctp_bind_addr_clean(bp);
-
-	if (bp->malloced) {
-		kfree(bp);
-		SCTP_DBG_OBJCNT_DEC(bind_addr);
-	}
 }
 
 /* Add an address to the bind address list in the SCTP_bind_addr structure. */