[8021Q]: vlan_ioctl_handler: fix return value

[linux-2.6] / net / rxrpc / af_rxrpc.c

diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c
index 2c57df9c131b4b614e65f4b45c57e12fadd100f0..16a68df4e36b9a8ba8c4e44ceb65f39c3bfb1fe6 100644 (file)
--- a/net/rxrpc/af_rxrpc.c
+++ b/net/rxrpc/af_rxrpc.c
@@ -792,7 +792,7 @@ static int __init af_rxrpc_init(void)
        ret = -ENOMEM;
        rxrpc_call_jar = kmem_cache_create(
                "rxrpc_call_jar", sizeof(struct rxrpc_call), 0,
-               SLAB_HWCACHE_ALIGN, NULL, NULL);
+               SLAB_HWCACHE_ALIGN, NULL);
        if (!rxrpc_call_jar) {
                printk(KERN_NOTICE "RxRPC: Failed to allocate call jar\n");
                goto error_call_jar;
@@ -805,26 +805,26 @@ static int __init af_rxrpc_init(void)
        }
 
        ret = proto_register(&rxrpc_proto, 1);
-        if (ret < 0) {
-                printk(KERN_CRIT "RxRPC: Cannot register protocol\n");
+       if (ret < 0) {
+               printk(KERN_CRIT "RxRPC: Cannot register protocol\n");
                goto error_proto;
        }
 
        ret = sock_register(&rxrpc_family_ops);
        if (ret < 0) {
-                printk(KERN_CRIT "RxRPC: Cannot register socket family\n");
+               printk(KERN_CRIT "RxRPC: Cannot register socket family\n");
                goto error_sock;
        }
 
        ret = register_key_type(&key_type_rxrpc);
        if (ret < 0) {
-                printk(KERN_CRIT "RxRPC: Cannot register client key type\n");
+               printk(KERN_CRIT "RxRPC: Cannot register client key type\n");
                goto error_key_type;
        }
 
        ret = register_key_type(&key_type_rxrpc_s);
        if (ret < 0) {
-                printk(KERN_CRIT "RxRPC: Cannot register server key type\n");
+               printk(KERN_CRIT "RxRPC: Cannot register server key type\n");
                goto error_key_type_s;
        }