diff options
| author | Gerrit Renker <gerrit@erg.abdn.ac.uk> | 2006-11-20 18:39:23 -0200 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-02 21:24:38 -0800 |
| commit | 59348b19efebfd6a8d0791ff81d207b16594c94b (patch) | |
| tree | a9212a7bf62bd594cf02d23b9e33eb45a46d414d /net/dccp/ackvec.c | |
| parent | b1308dc015eb09cf094ca169296738a13ae049ad (diff) | |
| download | linux-3.10-59348b19efebfd6a8d0791ff81d207b16594c94b.tar.gz linux-3.10-59348b19efebfd6a8d0791ff81d207b16594c94b.tar.bz2 linux-3.10-59348b19efebfd6a8d0791ff81d207b16594c94b.zip | |
[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>
Diffstat (limited to 'net/dccp/ackvec.c')
| -rw-r--r-- | net/dccp/ackvec.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/dccp/ackvec.c b/net/dccp/ackvec.c index d34badcd012..1b4b60d8bde 100644 --- a/net/dccp/ackvec.c +++ b/net/dccp/ackvec.c @@ -461,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", @@ -485,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; } |