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

Commit 8995a238 authored by Gerrit Renker's avatar Gerrit Renker Committed by David S. Miller
Browse files

[TFRC]: Loss interval code needs the macros/inlines that were moved 



This moves the inlines (which were previously declared as macros) back into
packet_history.h since the loss detection code needs to be able to read entries
from the RX history in order to create the relevant loss entries: it needs at
least tfrc_rx_hist_loss_prev() and tfrc_rx_hist_last_rcv(), which in turn
require the definition of the other inlines (macros).

Signed-off-by: default avatarGerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent df8f83fd

net/dccp/ccids/lib/packet_history.c

+0 −35
Original line number Diff line number Diff line
@@ -151,23 +151,6 @@ void tfrc_rx_packet_history_exit(void) 
	}

}



/**

 * tfrc_rx_hist_index - index to reach n-th entry after loss_start

 */

static inline u8 tfrc_rx_hist_index(const struct tfrc_rx_hist *h, const u8 n)

{

	return (h->loss_start + n) & TFRC_NDUPACK;

}



/**

 * tfrc_rx_hist_last_rcv - entry with highest-received-seqno so far

 */

static inline struct tfrc_rx_hist_entry *

			tfrc_rx_hist_last_rcv(const struct tfrc_rx_hist *h)

{

	return h->ring[tfrc_rx_hist_index(h, h->loss_count)];

}



void tfrc_rx_hist_add_packet(struct tfrc_rx_hist *h,

			     const struct sk_buff *skb,

			     const u32 ndp)
@@ -183,24 +166,6 @@ void tfrc_rx_hist_add_packet(struct tfrc_rx_hist *h, 
}

EXPORT_SYMBOL_GPL(tfrc_rx_hist_add_packet);



/**

 * tfrc_rx_hist_entry - return the n-th history entry after loss_start

 */

static inline struct tfrc_rx_hist_entry *

		tfrc_rx_hist_entry(const struct tfrc_rx_hist *h, const u8 n)

{

	return h->ring[tfrc_rx_hist_index(h, n)];

}



/**

 * tfrc_rx_hist_loss_prev - entry with highest-received-seqno before loss was detected

 */

static inline struct tfrc_rx_hist_entry *

			tfrc_rx_hist_loss_prev(const struct tfrc_rx_hist *h)

{

	return h->ring[h->loss_start];

}



/* has the packet contained in skb been seen before? */

int tfrc_rx_hist_duplicate(struct tfrc_rx_hist *h, struct sk_buff *skb)

{

net/dccp/ccids/lib/packet_history.h

+35 −0
Original line number Diff line number Diff line
@@ -84,6 +84,41 @@ struct tfrc_rx_hist { 
#define rtt_sample_prev		  loss_start

};



/**

 * tfrc_rx_hist_index - index to reach n-th entry after loss_start

 */

static inline u8 tfrc_rx_hist_index(const struct tfrc_rx_hist *h, const u8 n)

{

	return (h->loss_start + n) & TFRC_NDUPACK;

}



/**

 * tfrc_rx_hist_last_rcv - entry with highest-received-seqno so far

 */

static inline struct tfrc_rx_hist_entry *

			tfrc_rx_hist_last_rcv(const struct tfrc_rx_hist *h)

{

	return h->ring[tfrc_rx_hist_index(h, h->loss_count)];

}



/**

 * tfrc_rx_hist_entry - return the n-th history entry after loss_start

 */

static inline struct tfrc_rx_hist_entry *

			tfrc_rx_hist_entry(const struct tfrc_rx_hist *h, const u8 n)

{

	return h->ring[tfrc_rx_hist_index(h, n)];

}



/**

 * tfrc_rx_hist_loss_prev - entry with highest-received-seqno before loss was detected

 */

static inline struct tfrc_rx_hist_entry *

			tfrc_rx_hist_loss_prev(const struct tfrc_rx_hist *h)

{

	return h->ring[h->loss_start];

}



extern void tfrc_rx_hist_add_packet(struct tfrc_rx_hist *h,

				    const struct sk_buff *skb, const u32 ndp);