net: em_cmp.c use unaligned access helpers

[linux-2.6-omap-h63xx.git] / net / dccp / ccids / lib / tfrc_equation.c

diff --git a/net/dccp/ccids/lib/tfrc_equation.c b/net/dccp/ccids/lib/tfrc_equation.c
index 38239c4d5e147c221ed57dca34819f0877d24b5f..2f20a29cffe417a9ca7de9f1153763722ee087ba 100644 (file)
--- a/net/dccp/ccids/lib/tfrc_equation.c
+++ b/net/dccp/ccids/lib/tfrc_equation.c
@@ -632,16 +632,8 @@ u32 tfrc_calc_x(u16 s, u32 R, u32 p)
 
        if (p <= TFRC_CALC_X_SPLIT)             {     /* 0.0000 < p <= 0.05   */
                if (p < TFRC_SMALLEST_P) {            /* 0.0000 < p <  0.0001 */
-                       /*
-                        * In the congestion-avoidance phase p decays towards 0
-                        * when there are no further losses, so this case is
-                        * natural. Truncating to p_min = 0.01% means that the
-                        * maximum achievable throughput is limited to about
-                        * X_calc_max = 122.4 * s/RTT (see RFC 3448, 3.1); e.g.
-                        * with s=1500 bytes, RTT=0.01 s: X_calc_max = 147 Mbps.
-                        */
-                       tfrc_pr_debug("Value of p (%d) below resolution. "
-                                     "Substituting %d\n", p, TFRC_SMALLEST_P);
+                       DCCP_WARN("Value of p (%d) below resolution. "
+                                 "Substituting %d\n", p, TFRC_SMALLEST_P);
                        index = 0;
                } else                                /* 0.0001 <= p <= 0.05  */
                        index =  p/TFRC_SMALLEST_P - 1;
@@ -666,6 +658,7 @@ u32 tfrc_calc_x(u16 s, u32 R, u32 p)
        result = scaled_div(s, R);
        return scaled_div32(result, f);
 }
+
 EXPORT_SYMBOL_GPL(tfrc_calc_x);
 
 /**
@@ -700,19 +693,5 @@ u32 tfrc_calc_x_reverse_lookup(u32 fvalue)
        index = tfrc_binsearch(fvalue, 0);
        return (index + 1) * 1000000 / TFRC_CALC_X_ARRSIZE;
 }
-EXPORT_SYMBOL_GPL(tfrc_calc_x_reverse_lookup);
 
-/**
- * tfrc_invert_loss_event_rate  -  Compute p so that 10^6 corresponds to 100%
- * When @loss_event_rate is large, there is a chance that p is truncated to 0.
- * To avoid re-entering slow-start in that case, we set p = TFRC_SMALLEST_P > 0.
- */
-u32 tfrc_invert_loss_event_rate(u32 loss_event_rate)
-{
-       if (loss_event_rate == UINT_MAX)                /* see RFC 4342, 8.5 */
-               return 0;
-       if (unlikely(loss_event_rate == 0))             /* map 1/0 into 100% */
-               return 1000000;
-       return max_t(u32, scaled_div(1, loss_event_rate), TFRC_SMALLEST_P);
-}
-EXPORT_SYMBOL_GPL(tfrc_invert_loss_event_rate);
+EXPORT_SYMBOL_GPL(tfrc_calc_x_reverse_lookup);