[CCID2]: Remove redundant synchronisation variable

[firefly-linux-kernel-4.4.55.git] / net / dccp / ccids / ccid2.c

diff --git a/net/dccp/ccids/ccid2.c b/net/dccp/ccids/ccid2.c
index 237007bb55a8c9dfa4d6c559dd16f2fdfd9a0532..4f6c35261b6e153624791194ddc30e8ee4a51510 100644 (file)
--- a/net/dccp/ccids/ccid2.c
+++ b/net/dccp/ccids/ccid2.c
@@ -126,16 +126,8 @@ static int ccid2_hc_tx_send_packet(struct sock *sk, struct sk_buff *skb)
 {
        struct ccid2_hc_tx_sock *hctx = ccid2_hc_tx_sk(sk);
 
-       ccid2_pr_debug("pipe=%d cwnd=%d\n", hctx->ccid2hctx_pipe,
-                      hctx->ccid2hctx_cwnd);
-
-       if (hctx->ccid2hctx_pipe < hctx->ccid2hctx_cwnd) {
-               /* OK we can send... make sure previous packet was sent off */
-               if (!hctx->ccid2hctx_sendwait) {
-                       hctx->ccid2hctx_sendwait = 1;
-                       return 0;
-               }
-       }
+       if (hctx->ccid2hctx_pipe < hctx->ccid2hctx_cwnd)
+               return 0;
 
        return 1; /* XXX CCID should dequeue when ready instead of polling */
 }
@@ -239,10 +231,6 @@ static void ccid2_hc_tx_packet_sent(struct sock *sk, int more, unsigned int len)
        struct ccid2_seq *next;
        u64 seq;
 
-       ccid2_hc_tx_check_sanity(hctx);
-
-       BUG_ON(!hctx->ccid2hctx_sendwait);
-       hctx->ccid2hctx_sendwait = 0;
        hctx->ccid2hctx_pipe++;
 
        /* There is an issue.  What if another packet is sent between
@@ -326,7 +314,6 @@ static void ccid2_hc_tx_packet_sent(struct sock *sk, int more, unsigned int len)
                ccid2_start_rto_timer(sk);
 
 #ifdef CONFIG_IP_DCCP_CCID2_DEBUG
-       ccid2_pr_debug("pipe=%d\n", hctx->ccid2hctx_pipe);
        ccid2_pr_debug("Sent: seq=%llu\n", (unsigned long long)seq);
        do {
                struct ccid2_seq *seqp = hctx->ccid2hctx_seqt;