Patched in Tegra support.

8 files changed, 34 insertions, 97 deletions

diff --git a/net/dccp/ccids/ccid2.c b/net/dccp/ccids/ccid2.c
index f053198e730..0462040fc81 100644
--- a/net/dccp/ccids/ccid2.c
+++ b/net/dccp/ccids/ccid2.c
@@ -29,7 +29,7 @@
 
 
 #ifdef CONFIG_IP_DCCP_CCID2_DEBUG
-static bool ccid2_debug;
+static int ccid2_debug;
 #define ccid2_pr_debug(format, a...)    DCCP_PR_DEBUG(ccid2_debug, format, ##a)
 #else
 #define ccid2_pr_debug(format, a...)
@@ -85,6 +85,7 @@ static int ccid2_hc_tx_send_packet(struct sock *sk, struct sk_buff *skb)
 
 static void ccid2_change_l_ack_ratio(struct sock *sk, u32 val)
 {
+        struct dccp_sock *dp = dccp_sk(sk);
         u32 max_ratio = DIV_ROUND_UP(ccid2_hc_tx_sk(sk)->tx_cwnd, 2);
 
         /*
@@ -97,33 +98,14 @@ static void ccid2_change_l_ack_ratio(struct sock *sk, u32 val)
                 DCCP_WARN("Limiting Ack Ratio (%u) to %u\n", val, max_ratio);
                 val = max_ratio;
         }
-        dccp_feat_signal_nn_change(sk, DCCPF_ACK_RATIO,
-                                   min_t(u32, val, DCCPF_ACK_RATIO_MAX));
-}
+        if (val > DCCPF_ACK_RATIO_MAX)
+                val = DCCPF_ACK_RATIO_MAX;
 
-static void ccid2_check_l_ack_ratio(struct sock *sk)
-{
-        struct ccid2_hc_tx_sock *hc = ccid2_hc_tx_sk(sk);
-
-        /*
-         * After a loss, idle period, application limited period, or RTO we
-         * need to check that the ack ratio is still less than the congestion
-         * window. Otherwise, we will send an entire congestion window of
-         * packets and got no response because we haven't sent ack ratio
-         * packets yet.
-         * If the ack ratio does need to be reduced, we reduce it to half of
-         * the congestion window (or 1 if that's zero) instead of to the
-         * congestion window. This prevents problems if one ack is lost.
-         */
-        if (dccp_feat_nn_get(sk, DCCPF_ACK_RATIO) > hc->tx_cwnd)
-                ccid2_change_l_ack_ratio(sk, hc->tx_cwnd/2 ? : 1U);
-}
+        if (val == dp->dccps_l_ack_ratio)
+                return;
 
-static void ccid2_change_l_seq_window(struct sock *sk, u64 val)
-{
-        dccp_feat_signal_nn_change(sk, DCCPF_SEQUENCE_WINDOW,
-                                   clamp_val(val, DCCPF_SEQ_WMIN,
-                                                  DCCPF_SEQ_WMAX));
+        ccid2_pr_debug("changing local ack ratio to %u\n", val);
+        dp->dccps_l_ack_ratio = val;
 }
 
 static void ccid2_hc_tx_rto_expire(unsigned long data)
@@ -174,7 +156,7 @@ out:
 /*
  *      Congestion window validation (RFC 2861).
  */
-static bool ccid2_do_cwv = true;
+static int ccid2_do_cwv = 1;
 module_param(ccid2_do_cwv, bool, 0644);
 MODULE_PARM_DESC(ccid2_do_cwv, "Perform RFC2861 Congestion Window Validation");
 
@@ -205,8 +187,6 @@ static void ccid2_cwnd_application_limited(struct sock *sk, const u32 now)
         }
         hc->tx_cwnd_used  = 0;
         hc->tx_cwnd_stamp = now;
-
-        ccid2_check_l_ack_ratio(sk);
 }
 
 /* This borrows the code of tcp_cwnd_restart() */
@@ -225,8 +205,6 @@ static void ccid2_cwnd_restart(struct sock *sk, const u32 now)
 
         hc->tx_cwnd_stamp = now;
         hc->tx_cwnd_used  = 0;
-
-        ccid2_check_l_ack_ratio(sk);
 }
 
 static void ccid2_hc_tx_packet_sent(struct sock *sk, unsigned int len)
@@ -427,37 +405,17 @@ static void ccid2_new_ack(struct sock *sk, struct ccid2_seq *seqp,
                           unsigned int *maxincr)
 {
         struct ccid2_hc_tx_sock *hc = ccid2_hc_tx_sk(sk);
-        struct dccp_sock *dp = dccp_sk(sk);
-        int r_seq_used = hc->tx_cwnd / dp->dccps_l_ack_ratio;
-
-        if (hc->tx_cwnd < dp->dccps_l_seq_win &&
-            r_seq_used < dp->dccps_r_seq_win) {
-                if (hc->tx_cwnd < hc->tx_ssthresh) {
-                        if (*maxincr > 0 && ++hc->tx_packets_acked >= 2) {
-                                hc->tx_cwnd += 1;
-                                *maxincr    -= 1;
-                                hc->tx_packets_acked = 0;
-                        }
-                } else if (++hc->tx_packets_acked >= hc->tx_cwnd) {
+
+        if (hc->tx_cwnd < hc->tx_ssthresh) {
+                if (*maxincr > 0 && ++hc->tx_packets_acked == 2) {
                         hc->tx_cwnd += 1;
+                        *maxincr    -= 1;
                         hc->tx_packets_acked = 0;
                 }
+        } else if (++hc->tx_packets_acked >= hc->tx_cwnd) {
+                        hc->tx_cwnd += 1;
+                        hc->tx_packets_acked = 0;
         }
-
-        /*
-         * Adjust the local sequence window and the ack ratio to allow about
-         * 5 times the number of packets in the network (RFC 4340 7.5.2)
-         */
-        if (r_seq_used * CCID2_WIN_CHANGE_FACTOR >= dp->dccps_r_seq_win)
-                ccid2_change_l_ack_ratio(sk, dp->dccps_l_ack_ratio * 2);
-        else if (r_seq_used * CCID2_WIN_CHANGE_FACTOR < dp->dccps_r_seq_win/2)
-                ccid2_change_l_ack_ratio(sk, dp->dccps_l_ack_ratio / 2 ? : 1U);
-
-        if (hc->tx_cwnd * CCID2_WIN_CHANGE_FACTOR >= dp->dccps_l_seq_win)
-                ccid2_change_l_seq_window(sk, dp->dccps_l_seq_win * 2);
-        else if (hc->tx_cwnd * CCID2_WIN_CHANGE_FACTOR < dp->dccps_l_seq_win/2)
-                ccid2_change_l_seq_window(sk, dp->dccps_l_seq_win / 2);
-
         /*
          * FIXME: RTT is sampled several times per acknowledgment (for each
          * entry in the Ack Vector), instead of once per Ack (as in TCP SACK).
@@ -483,7 +441,9 @@ static void ccid2_congestion_event(struct sock *sk, struct ccid2_seq *seqp)
         hc->tx_cwnd      = hc->tx_cwnd / 2 ? : 1U;
         hc->tx_ssthresh  = max(hc->tx_cwnd, 2U);
 
-        ccid2_check_l_ack_ratio(sk);
+        /* Avoid spurious timeouts resulting from Ack Ratio > cwnd */
+        if (dccp_sk(sk)->dccps_l_ack_ratio > hc->tx_cwnd)
+                ccid2_change_l_ack_ratio(sk, hc->tx_cwnd);
 }
 
 static int ccid2_hc_tx_parse_options(struct sock *sk, u8 packet_type,
@@ -534,16 +494,8 @@ static void ccid2_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb)
                         if (hc->tx_rpdupack >= NUMDUPACK) {
                                 hc->tx_rpdupack = -1; /* XXX lame */
                                 hc->tx_rpseq    = 0;
-#ifdef __CCID2_COPES_GRACEFULLY_WITH_ACK_CONGESTION_CONTROL__
-                                /*
-                                 * FIXME: Ack Congestion Control is broken; in
-                                 * the current state instabilities occurred with
-                                 * Ack Ratios greater than 1; causing hang-ups
-                                 * and long RTO timeouts. This needs to be fixed
-                                 * before opening up dynamic changes. -- gerrit
-                                 */
+
                                 ccid2_change_l_ack_ratio(sk, 2 * dp->dccps_l_ack_ratio);
-#endif
                         }
                 }
         }
diff --git a/net/dccp/ccids/ccid2.h b/net/dccp/ccids/ccid2.h
index 18c97543e52..f585d330e1e 100644
--- a/net/dccp/ccids/ccid2.h
+++ b/net/dccp/ccids/ccid2.h
@@ -43,12 +43,6 @@ struct ccid2_seq {
 #define CCID2_SEQBUF_LEN 1024
 #define CCID2_SEQBUF_MAX 128
 
-/*
- * Multiple of congestion window to keep the sequence window at
- * (RFC 4340 7.5.2)
- */
-#define CCID2_WIN_CHANGE_FACTOR 5
-
 /**
  * struct ccid2_hc_tx_sock - CCID2 TX half connection
  * @tx_{cwnd,ssthresh,pipe}: as per RFC 4341, section 5
diff --git a/net/dccp/ccids/ccid3.c b/net/dccp/ccids/ccid3.c
index 119c04317d4..3d604e1349c 100644
--- a/net/dccp/ccids/ccid3.c
+++ b/net/dccp/ccids/ccid3.c
@@ -38,7 +38,7 @@
 #include <asm/unaligned.h>
 
 #ifdef CONFIG_IP_DCCP_CCID3_DEBUG
-static bool ccid3_debug;
+static int ccid3_debug;
 #define ccid3_pr_debug(format, a...)    DCCP_PR_DEBUG(ccid3_debug, format, ##a)
 #else
 #define ccid3_pr_debug(format, a...)
@@ -98,9 +98,8 @@ static void ccid3_update_send_interval(struct ccid3_hc_tx_sock *hc)
 {
         hc->tx_t_ipi = scaled_div32(((u64)hc->tx_s) << 6, hc->tx_x);
 
-        DCCP_BUG_ON(hc->tx_t_ipi == 0);
         ccid3_pr_debug("t_ipi=%u, s=%u, X=%u\n", hc->tx_t_ipi,
-                       hc->tx_s, (unsigned int)(hc->tx_x >> 6));
+                       hc->tx_s, (unsigned)(hc->tx_x >> 6));
 }
 
 static u32 ccid3_hc_tx_idle_rtt(struct ccid3_hc_tx_sock *hc, ktime_t now)
@@ -113,7 +112,6 @@ static u32 ccid3_hc_tx_idle_rtt(struct ccid3_hc_tx_sock *hc, ktime_t now)
 /**
  * ccid3_hc_tx_update_x  -  Update allowed sending rate X
  * @stamp: most recent time if available - can be left NULL.
- *
  * This function tracks draft rfc3448bis, check there for latest details.
  *
  * Note: X and X_recv are both stored in units of 64 * bytes/second, to support
@@ -154,19 +152,17 @@ static void ccid3_hc_tx_update_x(struct sock *sk, ktime_t *stamp)
 
         if (hc->tx_x != old_x) {
                 ccid3_pr_debug("X_prev=%u, X_now=%u, X_calc=%u, "
-                               "X_recv=%u\n", (unsigned int)(old_x >> 6),
-                               (unsigned int)(hc->tx_x >> 6), hc->tx_x_calc,
-                               (unsigned int)(hc->tx_x_recv >> 6));
+                               "X_recv=%u\n", (unsigned)(old_x >> 6),
+                               (unsigned)(hc->tx_x >> 6), hc->tx_x_calc,
+                               (unsigned)(hc->tx_x_recv >> 6));
 
                 ccid3_update_send_interval(hc);
         }
 }
 
-/**
- *      ccid3_hc_tx_update_s - Track the mean packet size `s'
+/*
+ *      Track the mean packet size `s' (cf. RFC 4342, 5.3 and  RFC 3448, 4.1)
  *      @len: DCCP packet payload size in bytes
- *
- *      cf. RFC 4342, 5.3 and  RFC 3448, 4.1
  */
 static inline void ccid3_hc_tx_update_s(struct ccid3_hc_tx_sock *hc, int len)
 {
@@ -240,6 +236,8 @@ static void ccid3_hc_tx_no_feedback_timer(unsigned long data)
                  *
                  *  Note that X_recv is scaled by 2^6 while X_calc is not
                  */
+                BUG_ON(hc->tx_p && !hc->tx_x_calc);
+
                 if (hc->tx_x_calc > (hc->tx_x_recv >> 5))
                         hc->tx_x_recv =
                                 max(hc->tx_x_recv / 2,
@@ -273,7 +271,6 @@ out:
 /**
  * ccid3_hc_tx_send_packet  -  Delay-based dequeueing of TX packets
  * @skb: next packet candidate to send on @sk
- *
  * This function uses the convention of ccid_packet_dequeue_eval() and
  * returns a millisecond-delay value between 0 and t_mbi = 64000 msec.
  */
@@ -429,8 +426,8 @@ done_computing_x:
                                "p=%u, X_calc=%u, X_recv=%u, X=%u\n",
                                dccp_role(sk), sk, hc->tx_rtt, r_sample,
                                hc->tx_s, hc->tx_p, hc->tx_x_calc,
-                               (unsigned int)(hc->tx_x_recv >> 6),
-                               (unsigned int)(hc->tx_x >> 6));
+                               (unsigned)(hc->tx_x_recv >> 6),
+                               (unsigned)(hc->tx_x >> 6));
 
         /* unschedule no feedback timer */
         sk_stop_timer(sk, &hc->tx_no_feedback_timer);
@@ -535,7 +532,6 @@ static int ccid3_hc_tx_getsockopt(struct sock *sk, const int optname, int len,
         case DCCP_SOCKOPT_CCID_TX_INFO:
                 if (len < sizeof(tfrc))
                         return -EINVAL;
-                memset(&tfrc, 0, sizeof(tfrc));
                 tfrc.tfrctx_x      = hc->tx_x;
                 tfrc.tfrctx_x_recv = hc->tx_x_recv;
                 tfrc.tfrctx_x_calc = hc->tx_x_calc;
diff --git a/net/dccp/ccids/lib/loss_interval.c b/net/dccp/ccids/lib/loss_interval.c
index 57f9fd78c4d..497723c4d4b 100644
--- a/net/dccp/ccids/lib/loss_interval.c
+++ b/net/dccp/ccids/lib/loss_interval.c
@@ -133,7 +133,6 @@ static inline u8 tfrc_lh_is_new_loss(struct tfrc_loss_interval *cur,
  * @rh:            Receive history containing a fresh loss event
  * @calc_first_li: Caller-dependent routine to compute length of first interval
  * @sk:            Used by @calc_first_li in caller-specific way (subtyping)
- *
  * Updates I_mean and returns 1 if a new interval has in fact been added to @lh.
  */
 int tfrc_lh_interval_add(struct tfrc_loss_hist *lh, struct tfrc_rx_hist *rh,
diff --git a/net/dccp/ccids/lib/packet_history.c b/net/dccp/ccids/lib/packet_history.c
index 08df7a3acb3..de8fe294bf0 100644
--- a/net/dccp/ccids/lib/packet_history.c
+++ b/net/dccp/ccids/lib/packet_history.c
@@ -315,7 +315,6 @@ static void __three_after_loss(struct tfrc_rx_hist *h)
  *  @ndp:           The NDP count belonging to @skb
  *  @calc_first_li: Caller-dependent computation of first loss interval in @lh
  *  @sk:            Used by @calc_first_li (see tfrc_lh_interval_add)
- *
  *  Chooses action according to pending loss, updates LI database when a new
  *  loss was detected, and does required post-processing. Returns 1 when caller
  *  should send feedback, 0 otherwise.
@@ -388,7 +387,7 @@ static inline struct tfrc_rx_hist_entry *
 }
 
 /**
- * tfrc_rx_hist_rtt_prev_s - previously suitable (wrt rtt_last_s) RTT-sampling entry
+ * tfrc_rx_hist_rtt_prev_s: previously suitable (wrt rtt_last_s) RTT-sampling entry
  */
 static inline struct tfrc_rx_hist_entry *
                         tfrc_rx_hist_rtt_prev_s(const struct tfrc_rx_hist *h)
diff --git a/net/dccp/ccids/lib/tfrc.c b/net/dccp/ccids/lib/tfrc.c
index 62b5828acde..4902029854d 100644
--- a/net/dccp/ccids/lib/tfrc.c
+++ b/net/dccp/ccids/lib/tfrc.c
@@ -4,11 +4,10 @@
  * Copyright (c) 2007 The University of Aberdeen, Scotland, UK
  * Copyright (c) 2007 Arnaldo Carvalho de Melo <acme@redhat.com>
  */
-#include <linux/moduleparam.h>
 #include "tfrc.h"
 
 #ifdef CONFIG_IP_DCCP_TFRC_DEBUG
-bool tfrc_debug;
+int tfrc_debug;
 module_param(tfrc_debug, bool, 0644);
 MODULE_PARM_DESC(tfrc_debug, "Enable TFRC debug messages");
 #endif
diff --git a/net/dccp/ccids/lib/tfrc.h b/net/dccp/ccids/lib/tfrc.h
index ed698c42a5f..f8ee3f54977 100644
--- a/net/dccp/ccids/lib/tfrc.h
+++ b/net/dccp/ccids/lib/tfrc.h
@@ -21,7 +21,7 @@
 #include "packet_history.h"
 
 #ifdef CONFIG_IP_DCCP_TFRC_DEBUG
-extern bool tfrc_debug;
+extern int tfrc_debug;
 #define tfrc_pr_debug(format, a...)     DCCP_PR_DEBUG(tfrc_debug, format, ##a)
 #else
 #define tfrc_pr_debug(format, a...)
diff --git a/net/dccp/ccids/lib/tfrc_equation.c b/net/dccp/ccids/lib/tfrc_equation.c
index 88ef98285be..a052a4377e2 100644
--- a/net/dccp/ccids/lib/tfrc_equation.c
+++ b/net/dccp/ccids/lib/tfrc_equation.c
@@ -611,7 +611,6 @@ static inline u32 tfrc_binsearch(u32 fval, u8 small)
  * @s: packet size          in bytes
  * @R: RTT                  scaled by 1000000   (i.e., microseconds)
  * @p: loss ratio estimate  scaled by 1000000
- *
  * Returns X_calc           in bytes per second (not scaled).
  */
 u32 tfrc_calc_x(u16 s, u32 R, u32 p)
@@ -660,7 +659,6 @@ u32 tfrc_calc_x(u16 s, u32 R, u32 p)
 /**
  *  tfrc_calc_x_reverse_lookup  -  try to find p given f(p)
  *  @fvalue: function value to match, scaled by 1000000
- *
  *  Returns closest match for p, also scaled by 1000000
  */
 u32 tfrc_calc_x_reverse_lookup(u32 fvalue)