From ac3f9e0b343e8f5b8b0d0f0c20463c559f26f696 Mon Sep 17 00:00:00 2001 From: Daniel Borkmann Date: Tue, 16 Apr 2013 11:07:16 +0000 Subject: [PATCH] --- yaml --- r: 369271 b: refs/heads/master c: 50181c07cbde370986c4925b830ca291a2fc31ab h: refs/heads/master i: 369269: b0b794691ef042d70dd7275d84617549e70fb1df 369267: 28dc67f25a93a2cca206a15cad28491fd51a6fd1 369263: b39a1e463f3bddfb87e0a89198a8de4aea87ba14 v: v3 --- [refs] | 2 +- trunk/include/net/sctp/structs.h | 2 -- trunk/net/sctp/bind_addr.c | 7 ------- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 5e7509f8e747..13245004417b 100644 --- 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 index d581af00120b..64d469845f25 100644 --- 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 index d886b3bf84f5..41145fe31813 100644 --- 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. */