diff options
| author | Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> | 2016-03-29 15:41:03 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-03-30 21:41:22 +0200 |
| commit | 28fd34985bd5edaea6282a0586f91bcddd336f5e (patch) | |
| tree | 65149988f3d2615baa589ff740991b16c1f2e55d /net | |
| parent | bridge: Allow set bridge ageing time when switchdev disabled (diff) | |
| download | linux-28fd34985bd5edaea6282a0586f91bcddd336f5e.tar.xz linux-28fd34985bd5edaea6282a0586f91bcddd336f5e.zip | |
sctp: really allow using GFP_KERNEL on sctp_packet_transmit
Somehow my patch for commit cea8768f333e ("sctp: allow
sctp_transmit_packet and others to use gfp") missed two important
chunks, which are now added.
Fixes: cea8768f333e ("sctp: allow sctp_transmit_packet and others to use gfp")
Signed-off-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Acked-By: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sctp/output.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/sctp/output.c b/net/sctp/output.c index 736c004abfbc..97745351d58c 100644 --- a/net/sctp/output.c +++ b/net/sctp/output.c @@ -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; @@ -523,8 +523,8 @@ 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); + (struct sctp_auth_chunk *)auth, + gfp); /* 2) Calculate the Adler-32 checksum of the whole packet, * including the SCTP common header and all the |