[DCCP]: Simplified conditions due to use of enum:8 states

[linux-2.6-omap-h63xx.git] / net / dccp / ackvec.c

diff --git a/net/dccp/ackvec.c b/net/dccp/ackvec.c
index f8208874ac7d79bc3f4c3516e54d7e7e87514c90..1b4b60d8bdec89acedbf8314d3aab1f034f08dfe 100644 (file)
--- a/net/dccp/ackvec.c
+++ b/net/dccp/ackvec.c
@@ -67,10 +67,6 @@ static void dccp_ackvec_insert_avr(struct dccp_ackvec *av,
 int dccp_insert_option_ackvec(struct sock *sk, struct sk_buff *skb)
 {
        struct dccp_sock *dp = dccp_sk(sk);
-#ifdef CONFIG_IP_DCCP_DEBUG
-       const char *debug_prefix = dp->dccps_role == DCCP_ROLE_CLIENT ?
-                               "CLIENT tx: " : "server tx: ";
-#endif
        struct dccp_ackvec *av = dp->dccps_hc_rx_ackvec;
        int len = av->dccpav_vec_len + 2;
        struct timeval now;
@@ -129,9 +125,9 @@ int dccp_insert_option_ackvec(struct sock *sk, struct sk_buff *skb)
 
        dccp_ackvec_insert_avr(av, avr);
 
-       dccp_pr_debug("%sACK Vector 0, len=%d, ack_seqno=%llu, "
+       dccp_pr_debug("%s ACK Vector 0, len=%d, ack_seqno=%llu, "
                      "ack_ackno=%llu\n",
-                     debug_prefix, avr->dccpavr_sent_len,
+                     dccp_role(sk), avr->dccpavr_sent_len,
                      (unsigned long long)avr->dccpavr_ack_seqno,
                      (unsigned long long)avr->dccpavr_ack_ackno);
        return 0;
@@ -322,21 +318,18 @@ out_duplicate:
 #ifdef CONFIG_IP_DCCP_DEBUG
 void dccp_ackvector_print(const u64 ackno, const unsigned char *vector, int len)
 {
-       if (!dccp_debug)
-               return;
-
-       printk("ACK vector len=%d, ackno=%llu |", len,
-              (unsigned long long)ackno);
+       dccp_pr_debug_cat("ACK vector len=%d, ackno=%llu |", len,
+                                       (unsigned long long)ackno);
 
        while (len--) {
                const u8 state = (*vector & DCCP_ACKVEC_STATE_MASK) >> 6;
                const u8 rl = *vector & DCCP_ACKVEC_LEN_MASK;
 
-               printk("%d,%d|", state, rl);
+               dccp_pr_debug_cat("%d,%d|", state, rl);
                ++vector;
        }
 
-       printk("\n");
+       dccp_pr_debug_cat("\n");
 }
 
 void dccp_ackvec_print(const struct dccp_ackvec *av)
@@ -380,19 +373,15 @@ void dccp_ackvec_check_rcv_ackno(struct dccp_ackvec *av, struct sock *sk,
         */
        list_for_each_entry_reverse(avr, &av->dccpav_records, dccpavr_node) {
                if (ackno == avr->dccpavr_ack_seqno) {
-#ifdef CONFIG_IP_DCCP_DEBUG
-                       struct dccp_sock *dp = dccp_sk(sk);
-                       const char *debug_prefix = dp->dccps_role == DCCP_ROLE_CLIENT ?
-                                               "CLIENT rx ack: " : "server rx ack: ";
-#endif
-                       dccp_pr_debug("%sACK packet 0, len=%d, ack_seqno=%llu, "
+                       dccp_pr_debug("%s ACK packet 0, len=%d, ack_seqno=%llu, "
                                      "ack_ackno=%llu, ACKED!\n",
-                                     debug_prefix, 1,
+                                     dccp_role(sk), 1,
                                      (unsigned long long)avr->dccpavr_ack_seqno,
                                      (unsigned long long)avr->dccpavr_ack_ackno);
                        dccp_ackvec_throw_record(av, avr);
                        break;
-               }
+               } else if (avr->dccpavr_ack_seqno > ackno)
+                       break; /* old news */
        }
 }
 
@@ -437,16 +426,10 @@ found:
                if (between48(avr->dccpavr_ack_seqno, ackno_end_rl, ackno)) {
                        const u8 state = *vector & DCCP_ACKVEC_STATE_MASK;
                        if (state != DCCP_ACKVEC_STATE_NOT_RECEIVED) {
-#ifdef CONFIG_IP_DCCP_DEBUG
-                               struct dccp_sock *dp = dccp_sk(sk);
-                               const char *debug_prefix =
-                                       dp->dccps_role == DCCP_ROLE_CLIENT ?
-                                       "CLIENT rx ack: " : "server rx ack: ";
-#endif
-                               dccp_pr_debug("%sACK vector 0, len=%d, "
+                               dccp_pr_debug("%s ACK vector 0, len=%d, "
                                              "ack_seqno=%llu, ack_ackno=%llu, "
                                              "ACKED!\n",
-                                             debug_prefix, len,
+                                             dccp_role(sk), len,
                                              (unsigned long long)
                                              avr->dccpavr_ack_seqno,
                                              (unsigned long long)
@@ -478,9 +461,6 @@ int dccp_ackvec_parse(struct sock *sk, const struct sk_buff *skb,
        return 0;
 }
 
-static char dccp_ackvec_slab_msg[] __initdata =
-       KERN_CRIT "DCCP: Unable to create ack vectors slab caches\n";
-
 int __init dccp_ackvec_init(void)
 {
        dccp_ackvec_slab = kmem_cache_create("dccp_ackvec",
@@ -502,7 +482,7 @@ out_destroy_slab:
        kmem_cache_destroy(dccp_ackvec_slab);
        dccp_ackvec_slab = NULL;
 out_err:
-       printk(dccp_ackvec_slab_msg);
+       DCCP_CRIT("Unable to create Ack Vector slab cache");
        return -ENOBUFS;
 }