aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/ccids/ccid3.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/dccp/ccids/ccid3.c')
-rw-r--r--net/dccp/ccids/ccid3.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c
index 09274f32a337..21948d023c72 100644
--- a/net/dccp/ccids/ccid3.c
+++ b/net/dccp/ccids/ccid3.c
@@ -82,12 +82,13 @@ enum ccid3_options {
82 82
83static int ccid3_debug; 83static int ccid3_debug;
84 84
85struct dccp_tx_hist *ccid3_tx_hist; 85static struct dccp_tx_hist *ccid3_tx_hist;
86struct dccp_rx_hist *ccid3_rx_hist; 86static struct dccp_rx_hist *ccid3_rx_hist;
87 87
88static kmem_cache_t *ccid3_loss_interval_hist_slab; 88static kmem_cache_t *ccid3_loss_interval_hist_slab;
89 89
90static inline struct ccid3_loss_interval_hist_entry *ccid3_loss_interval_hist_entry_new(int prio) 90static inline struct ccid3_loss_interval_hist_entry *
91 ccid3_loss_interval_hist_entry_new(const unsigned int __nocast prio)
91{ 92{
92 return kmem_cache_alloc(ccid3_loss_interval_hist_slab, prio); 93 return kmem_cache_alloc(ccid3_loss_interval_hist_slab, prio);
93} 94}
@@ -1593,7 +1594,9 @@ static void ccid3_hc_rx_insert_options(struct sock *sk, struct sk_buff *skb)
1593 * These are integers as per section 8 of RFC3448. We can then divide by 4 * 1594 * These are integers as per section 8 of RFC3448. We can then divide by 4 *
1594 * when we use it. 1595 * when we use it.
1595 */ 1596 */
1596const int ccid3_hc_rx_w[TFRC_RECV_IVAL_F_LENGTH] = { 4, 4, 4, 4, 3, 2, 1, 1, }; 1597static const int ccid3_hc_rx_w[TFRC_RECV_IVAL_F_LENGTH] = {
1598 4, 4, 4, 4, 3, 2, 1, 1,
1599};
1597 1600
1598/* 1601/*
1599 * args: fvalue - function value to match 1602 * args: fvalue - function value to match
@@ -1601,7 +1604,7 @@ const int ccid3_hc_rx_w[TFRC_RECV_IVAL_F_LENGTH] = { 4, 4, 4, 4, 3, 2, 1, 1, };
1601 * 1604 *
1602 * both fvalue and p are multiplied by 1,000,000 to use ints 1605 * both fvalue and p are multiplied by 1,000,000 to use ints
1603 */ 1606 */
1604u32 calcx_reverse_lookup(u32 fvalue) { 1607static u32 calcx_reverse_lookup(u32 fvalue) {
1605 int ctr = 0; 1608 int ctr = 0;
1606 int small; 1609 int small;
1607 1610