Commit 66b91d2c authored by Marcelo Ricardo Leitner's avatar Marcelo Ricardo Leitner Committed by David S. Miller
Browse files

sctp: remove return value from sctp_packet_init/config 



There is no reason to use this cascading. It doesn't add anything.
Let's remove it and simplify.

Signed-off-by: default avatarMarcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0630c56e

include/net/sctp/structs.h

+3 −4
Original line number Diff line number Diff line
@@ -722,10 +722,9 @@ struct sctp_packet { 
	    ipfragok:1;		/* So let ip fragment this packet */

};



struct sctp_packet *sctp_packet_init(struct sctp_packet *,

				     struct sctp_transport *,

void sctp_packet_init(struct sctp_packet *, struct sctp_transport *,

		      __u16 sport, __u16 dport);

struct sctp_packet *sctp_packet_config(struct sctp_packet *, __u32 vtag, int);

void sctp_packet_config(struct sctp_packet *, __u32 vtag, int);

sctp_xmit_t sctp_packet_transmit_chunk(struct sctp_packet *,

				       struct sctp_chunk *, int, gfp_t);

sctp_xmit_t sctp_packet_append_chunk(struct sctp_packet *,

net/sctp/output.c

+5 −9
Original line number Diff line number Diff line
@@ -81,8 +81,8 @@ static void sctp_packet_reset(struct sctp_packet *packet) 
/* Config a packet.

 * This appears to be a followup set of initializations.

 */

struct sctp_packet *sctp_packet_config(struct sctp_packet *packet,

				       __u32 vtag, int ecn_capable)

void sctp_packet_config(struct sctp_packet *packet, __u32 vtag,

			int ecn_capable)

{

	struct sctp_transport *tp = packet->transport;

	struct sctp_association *asoc = tp->asoc;
@@ -123,12 +123,10 @@ struct sctp_packet *sctp_packet_config(struct sctp_packet *packet, 
		if (chunk)

			sctp_packet_append_chunk(packet, chunk);

	}



	return packet;

}



/* Initialize the packet structure. */

struct sctp_packet *sctp_packet_init(struct sctp_packet *packet,

void sctp_packet_init(struct sctp_packet *packet,

		      struct sctp_transport *transport,

		      __u16 sport, __u16 dport)

{
@@ -151,8 +149,6 @@ struct sctp_packet *sctp_packet_init(struct sctp_packet *packet, 
	packet->overhead = overhead;

	sctp_packet_reset(packet);

	packet->vtag = 0;



	return packet;

}



/* Free a packet.  */

net/sctp/sm_statefuns.c

+3 −2
Original line number Diff line number Diff line
@@ -6032,8 +6032,9 @@ static struct sctp_packet *sctp_ootb_pkt_new(struct net *net, 
	sctp_transport_route(transport, (union sctp_addr *)&chunk->dest,

			     sctp_sk(net->sctp.ctl_sock));



	packet = sctp_packet_init(&transport->packet, transport, sport, dport);

	packet = sctp_packet_config(packet, vtag, 0);

	packet = &transport->packet;

	sctp_packet_init(packet, transport, sport, dport);

	sctp_packet_config(packet, vtag, 0);



	return packet;