diff --git a/[refs] b/[refs] index 300724b09305..d1947a54e893 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c69bce20dda7f79160856a338298d65a284ba303 +refs/heads/master: 78282d2af598a1840934e2049a5c196885647f6a diff --git a/trunk/net/dccp/ccids/lib/packet_history.c b/trunk/net/dccp/ccids/lib/packet_history.c index 4eddb2da8334..54cd23e7c27e 100644 --- a/trunk/net/dccp/ccids/lib/packet_history.c +++ b/trunk/net/dccp/ccids/lib/packet_history.c @@ -114,6 +114,11 @@ u32 tfrc_tx_hist_rtt(struct tfrc_tx_hist_entry *head, const u64 seqno, EXPORT_SYMBOL_GPL(tfrc_tx_hist_rtt); +/* + * Receiver History Routines + */ +static struct kmem_cache *tfrc_rx_hist_slab; + /** * tfrc_rx_hist_index - index to reach n-th entry after loss_start */ @@ -131,11 +136,6 @@ static inline struct tfrc_rx_hist_entry * return h->ring[tfrc_rx_hist_index(h, h->loss_count)]; } -/* - * Receiver History Routines - */ -static struct kmem_cache *tfrc_rx_hist_slab; - void tfrc_rx_hist_add_packet(struct tfrc_rx_hist *h, const struct sk_buff *skb, const u32 ndp)