rtnetlink: Fix error handling in do_setlink()

[safe/jmp/linux-2.6] / net / rds / rdma_transport.c

diff --git a/net/rds/rdma_transport.c b/net/rds/rdma_transport.c
index 9ece910..e599ba2 100644 (file)
--- a/net/rds/rdma_transport.c
+++ b/net/rds/rdma_transport.c
@@ -101,7 +101,7 @@ int rds_rdma_cm_event_handler(struct rdma_cm_id *cm_id,
                break;
 
        case RDMA_CM_EVENT_DISCONNECTED:
-               printk(KERN_WARNING "RDS/RDMA: DISCONNECT event - dropping connection "
+               rdsdebug("DISCONNECT event - dropping connection "
                        "%pI4->%pI4\n", &conn->c_laddr,
                         &conn->c_faddr);
                rds_conn_drop(conn);
@@ -109,8 +109,7 @@ int rds_rdma_cm_event_handler(struct rdma_cm_id *cm_id,
 
        default:
                /* things like device disconnect? */
-               printk(KERN_ERR "unknown event %u\n", event->event);
-               BUG();
+               printk(KERN_ERR "RDS: unknown event %u!\n", event->event);
                break;
        }
 
@@ -134,7 +133,7 @@ static int __init rds_rdma_listen_init(void)
                ret = PTR_ERR(cm_id);
                printk(KERN_ERR "RDS/RDMA: failed to setup listener, "
                       "rdma_create_id() returned %d\n", ret);
-               goto out;
+               return ret;
        }
 
        sin.sin_family = AF_INET,