Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

sctp: really allow using GFP_KERNEL on sctp_packet_transmit 



Somehow my patch for commit cea8768f ("sctp: allow
sctp_transmit_packet and others to use gfp") missed two important
chunks, which are now added.

Fixes: cea8768f ("sctp: allow sctp_transmit_packet and others to use gfp")
Signed-off-by: default avatarMarcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Acked-By: default avatarNeil Horman <nhorman@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5e263f71

net/sctp/output.c

+3 −3
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ int sctp_packet_transmit(struct sctp_packet *packet, gfp_t gfp) 
	sk = chunk->skb->sk;



	/* Allocate the new skb.  */

	nskb = alloc_skb(packet->size + MAX_HEADER, GFP_ATOMIC);

	nskb = alloc_skb(packet->size + MAX_HEADER, gfp);

	if (!nskb)

		goto nomem;
@@ -524,7 +524,7 @@ int sctp_packet_transmit(struct sctp_packet *packet, gfp_t gfp) 
	if (auth)

		sctp_auth_calculate_hmac(asoc, nskb,

					 (struct sctp_auth_chunk *)auth,

					GFP_ATOMIC);

					 gfp);



	/* 2) Calculate the Adler-32 checksum of the whole packet,

	 *    including the SCTP common header and all the