|
@@ -608,7 +608,7 @@ void sctp_retransmit(struct sctp_outq *q, struct sctp_transport *transport,
|
|
* The return value is a normal kernel error return value.
|
|
* The return value is a normal kernel error return value.
|
|
*/
|
|
*/
|
|
static int __sctp_outq_flush_rtx(struct sctp_outq *q, struct sctp_packet *pkt,
|
|
static int __sctp_outq_flush_rtx(struct sctp_outq *q, struct sctp_packet *pkt,
|
|
- int rtx_timeout, int *start_timer)
|
|
|
|
|
|
+ int rtx_timeout, int *start_timer, gfp_t gfp)
|
|
{
|
|
{
|
|
struct sctp_transport *transport = pkt->transport;
|
|
struct sctp_transport *transport = pkt->transport;
|
|
struct sctp_chunk *chunk, *chunk1;
|
|
struct sctp_chunk *chunk, *chunk1;
|
|
@@ -684,12 +684,12 @@ redo:
|
|
* control chunks are already freed so there
|
|
* control chunks are already freed so there
|
|
* is nothing we can do.
|
|
* is nothing we can do.
|
|
*/
|
|
*/
|
|
- sctp_packet_transmit(pkt, GFP_ATOMIC);
|
|
|
|
|
|
+ sctp_packet_transmit(pkt, gfp);
|
|
goto redo;
|
|
goto redo;
|
|
}
|
|
}
|
|
|
|
|
|
/* Send this packet. */
|
|
/* Send this packet. */
|
|
- error = sctp_packet_transmit(pkt, GFP_ATOMIC);
|
|
|
|
|
|
+ error = sctp_packet_transmit(pkt, gfp);
|
|
|
|
|
|
/* If we are retransmitting, we should only
|
|
/* If we are retransmitting, we should only
|
|
* send a single packet.
|
|
* send a single packet.
|
|
@@ -705,7 +705,7 @@ redo:
|
|
|
|
|
|
case SCTP_XMIT_RWND_FULL:
|
|
case SCTP_XMIT_RWND_FULL:
|
|
/* Send this packet. */
|
|
/* Send this packet. */
|
|
- error = sctp_packet_transmit(pkt, GFP_ATOMIC);
|
|
|
|
|
|
+ error = sctp_packet_transmit(pkt, gfp);
|
|
|
|
|
|
/* Stop sending DATA as there is no more room
|
|
/* Stop sending DATA as there is no more room
|
|
* at the receiver.
|
|
* at the receiver.
|
|
@@ -715,7 +715,7 @@ redo:
|
|
|
|
|
|
case SCTP_XMIT_DELAY:
|
|
case SCTP_XMIT_DELAY:
|
|
/* Send this packet. */
|
|
/* Send this packet. */
|
|
- error = sctp_packet_transmit(pkt, GFP_ATOMIC);
|
|
|
|
|
|
+ error = sctp_packet_transmit(pkt, gfp);
|
|
|
|
|
|
/* Stop sending DATA because of nagle delay. */
|
|
/* Stop sending DATA because of nagle delay. */
|
|
done = 1;
|
|
done = 1;
|
|
@@ -991,7 +991,7 @@ static void sctp_outq_flush_ctrl(struct sctp_outq *q,
|
|
static bool sctp_outq_flush_rtx(struct sctp_outq *q,
|
|
static bool sctp_outq_flush_rtx(struct sctp_outq *q,
|
|
struct sctp_transport **_transport,
|
|
struct sctp_transport **_transport,
|
|
struct list_head *transport_list,
|
|
struct list_head *transport_list,
|
|
- int rtx_timeout)
|
|
|
|
|
|
+ int rtx_timeout, gfp_t gfp)
|
|
{
|
|
{
|
|
struct sctp_transport *transport = *_transport;
|
|
struct sctp_transport *transport = *_transport;
|
|
struct sctp_packet *packet = transport ? &transport->packet : NULL;
|
|
struct sctp_packet *packet = transport ? &transport->packet : NULL;
|
|
@@ -1015,7 +1015,8 @@ static bool sctp_outq_flush_rtx(struct sctp_outq *q,
|
|
asoc->peer.ecn_capable);
|
|
asoc->peer.ecn_capable);
|
|
}
|
|
}
|
|
|
|
|
|
- error = __sctp_outq_flush_rtx(q, packet, rtx_timeout, &start_timer);
|
|
|
|
|
|
+ error = __sctp_outq_flush_rtx(q, packet, rtx_timeout, &start_timer,
|
|
|
|
+ gfp);
|
|
if (error < 0)
|
|
if (error < 0)
|
|
asoc->base.sk->sk_err = -error;
|
|
asoc->base.sk->sk_err = -error;
|
|
|
|
|
|
@@ -1074,7 +1075,7 @@ static void sctp_outq_flush_data(struct sctp_outq *q,
|
|
*/
|
|
*/
|
|
if (!list_empty(&q->retransmit)) {
|
|
if (!list_empty(&q->retransmit)) {
|
|
if (!sctp_outq_flush_rtx(q, _transport, transport_list,
|
|
if (!sctp_outq_flush_rtx(q, _transport, transport_list,
|
|
- rtx_timeout))
|
|
|
|
|
|
+ rtx_timeout, gfp))
|
|
break;
|
|
break;
|
|
/* We may have switched current transport */
|
|
/* We may have switched current transport */
|
|
transport = *_transport;
|
|
transport = *_transport;
|