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

This reaps the benefit of the earlier patch, which changed the type of
CCID 3 states to use enums, in that many conditions are now simplified
and the number of possible (unexpected) values is greatly reduced.

In a few instances, this also allowed to simplify pre-conditions; where
care has been taken to retain logical equivalence.

[DCCP]: Introduce a consistent BUG/WARN message scheme

This refines the existing set of DCCP messages so that
 * BUG(), BUG_ON(), WARN_ON() have meaningful DCCP-specific counterparts
 * DCCP_CRIT (for severe warnings) is not rate-limited
 * DCCP_WARN() is introduced as rate-limited wrapper

Using these allows a faster and cleaner transition to their original
counterparts once the code has matured into a full DCCP implementation.

Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>

1 files changed, 5 insertions, 11 deletions

diff --git a/net/dccp/output.c b/net/dccp/output.c
index c34eada7f025..bfd9c5757897 100644
--- a/net/dccp/output.c
+++ b/net/dccp/output.c
@@ -257,11 +257,8 @@ void dccp_write_xmit(struct sock *sk, int block)
                                 err = dccp_wait_for_ccid(sk, skb, &timeo);
                                 timeo = DCCP_XMIT_TIMEO;
                         }
-                        if (err) {
-                                printk(KERN_CRIT "%s:err at dccp_wait_for_ccid"
-                                                 " %d\n", __FUNCTION__, err);
-                                dump_stack();
-                        }
+                        if (err)
+                                DCCP_BUG("err=%d after dccp_wait_for_ccid", err);
                 }
 
                 skb_dequeue(&sk->sk_write_queue);
@@ -283,12 +280,9 @@ void dccp_write_xmit(struct sock *sk, int block)
 
                         err = dccp_transmit_skb(sk, skb);
                         ccid_hc_tx_packet_sent(dp->dccps_hc_tx_ccid, sk, 0, len);
-                        if (err) {
-                                printk(KERN_CRIT "%s:err from "
-                                                 "ccid_hc_tx_packet_sent %d\n",
-                                                 __FUNCTION__, err);
-                                dump_stack();
-                        }
+                        if (err)
+                                DCCP_BUG("err=%d after ccid_hc_tx_packet_sent",
+                                         err);
                 } else
                         kfree(skb);
         }