From 50e824247c3cc7b388c3a68ffd247496b4b902c2 Mon Sep 17 00:00:00 2001 From: Daniel Borkmann Date: Tue, 16 Apr 2013 11:07:15 +0000 Subject: [PATCH] --- yaml --- r: 369270 b: refs/heads/master c: 8fa5df6d210a09241876b74d156c57d833dd057b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/net/sctp/structs.h | 5 +---- trunk/net/sctp/transport.c | 1 - 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index b471cb117f83..5e7509f8e747 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dacda32ee694d9139c336c5e1cdfb826f6296186 +refs/heads/master: 8fa5df6d210a09241876b74d156c57d833dd057b diff --git a/trunk/include/net/sctp/structs.h b/trunk/include/net/sctp/structs.h index 73fd5de4d4cc..d581af00120b 100644 --- a/trunk/include/net/sctp/structs.h +++ b/trunk/include/net/sctp/structs.h @@ -779,10 +779,7 @@ struct sctp_transport { hb_sent:1, /* Is the Path MTU update pending on this tranport */ - pmtu_pending:1, - - /* Is this structure kfree()able? */ - malloced:1; + pmtu_pending:1; /* Has this transport moved the ctsn since we last sacked */ __u32 sack_generation; diff --git a/trunk/net/sctp/transport.c b/trunk/net/sctp/transport.c index fafd2a461ba0..098f1d5f769e 100644 --- a/trunk/net/sctp/transport.c +++ b/trunk/net/sctp/transport.c @@ -123,7 +123,6 @@ struct sctp_transport *sctp_transport_new(struct net *net, if (!sctp_transport_init(net, transport, addr, gfp)) goto fail_init; - transport->malloced = 1; SCTP_DBG_OBJCNT_INC(transport); return transport;