Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

net: sctp: minor: remove dead code from sctp_packet

Browse source 
struct sctp_packet is currently embedded into sctp_transport or
sits on the stack as 'singleton' in sctp_outq_flush(). Therefore,
its member 'malloced' is always 0, thus a kfree() is never called.
Because of that, we can just remove this code.

Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Daniel Borkmann 2013-04-18 21:59:37 +00:00 committed by David S. Miller
parent ae88408256
commit 3e3251b3f2
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/net/sctp/structs.h
View file

@ -714,8 +714,7 @@ struct sctp_packet {
has_sack:1, /* This packet contains a SACK chunk. */ has_sack:1, /* This packet contains a SACK chunk. */
has_auth:1, /* This packet contains an AUTH chunk */ has_auth:1, /* This packet contains an AUTH chunk */
has_data:1, /* This packet contains at least 1 DATA chunk */ has_data:1, /* This packet contains at least 1 DATA chunk */
ipfragok:1, /* So let ip fragment this packet */ ipfragok:1; /* So let ip fragment this packet */
malloced:1; /* Is it malloced? */
}; };
struct sctp_packet *sctp_packet_init(struct sctp_packet *, struct sctp_packet *sctp_packet_init(struct sctp_packet *,

5
net/sctp/output.c
View file

@ -136,7 +136,7 @@ struct sctp_packet *sctp_packet_init(struct sctp_packet *packet,
packet->overhead = overhead; packet->overhead = overhead;
sctp_packet_reset(packet); sctp_packet_reset(packet);
packet->vtag = 0; packet->vtag = 0;
packet->malloced = 0;
return packet; return packet;
} }
@ -151,9 +151,6 @@ void sctp_packet_free(struct sctp_packet *packet)
list_del_init(&chunk->list); list_del_init(&chunk->list);
sctp_chunk_free(chunk); sctp_chunk_free(chunk);
} }
if (packet->malloced)
kfree(packet);
} }
/* This routine tries to append the chunk to the offered packet. If adding /* This routine tries to append the chunk to the offered packet. If adding