Commit 16d14ef9 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

[SCTP]: Consolidate sctp_ulpq_renege_xxx functions 



Both are equal, except for the list to be traversed.

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Acked-by: default avatarVlad Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5c58298c

net/sctp/ulpqueue.c

+10 −24
Original line number Diff line number Diff line
@@ -908,8 +908,8 @@ void sctp_ulpq_skip(struct sctp_ulpq *ulpq, __u16 sid, __u16 ssn) 
	return;

}



/* Renege 'needed' bytes from the ordering queue. */

static __u16 sctp_ulpq_renege_order(struct sctp_ulpq *ulpq, __u16 needed)

static __u16 sctp_ulpq_renege_list(struct sctp_ulpq *ulpq,

		struct sk_buff_head *list, __u16 needed)

{

	__u16 freed = 0;

	__u32 tsn;
@@ -919,7 +919,7 @@ static __u16 sctp_ulpq_renege_order(struct sctp_ulpq *ulpq, __u16 needed) 


	tsnmap = &ulpq->asoc->peer.tsn_map;



	while ((skb = __skb_dequeue_tail(&ulpq->lobby)) != NULL) {

	while ((skb = __skb_dequeue_tail(list)) != NULL) {

		freed += skb_headlen(skb);

		event = sctp_skb2event(skb);

		tsn = event->tsn;
@@ -933,30 +933,16 @@ static __u16 sctp_ulpq_renege_order(struct sctp_ulpq *ulpq, __u16 needed) 
	return freed;

}



/* Renege 'needed' bytes from the reassembly queue. */

static __u16 sctp_ulpq_renege_frags(struct sctp_ulpq *ulpq, __u16 needed)

/* Renege 'needed' bytes from the ordering queue. */

static __u16 sctp_ulpq_renege_order(struct sctp_ulpq *ulpq, __u16 needed)

{

	__u16 freed = 0;

	__u32 tsn;

	struct sk_buff *skb;

	struct sctp_ulpevent *event;

	struct sctp_tsnmap *tsnmap;



	tsnmap = &ulpq->asoc->peer.tsn_map;



	/* Walk backwards through the list, reneges the newest tsns. */

	while ((skb = __skb_dequeue_tail(&ulpq->reasm)) != NULL) {

		freed += skb_headlen(skb);

		event = sctp_skb2event(skb);

		tsn = event->tsn;



		sctp_ulpevent_free(event);

		sctp_tsnmap_renege(tsnmap, tsn);

		if (freed >= needed)

			return freed;

	return sctp_ulpq_renege_list(ulpq, &ulpq->lobby, needed);

}



	return freed;

/* Renege 'needed' bytes from the reassembly queue. */

static __u16 sctp_ulpq_renege_frags(struct sctp_ulpq *ulpq, __u16 needed)

{

	return sctp_ulpq_renege_list(ulpq, &ulpq->reasm, needed);

}



/* Partial deliver the first message as there is pressure on rwnd. */