Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / net / rxrpc / peer.c

diff --git a/net/rxrpc/peer.c b/net/rxrpc/peer.c
index ed38f5b..8a27515 100644 (file)
--- a/net/rxrpc/peer.c
+++ b/net/rxrpc/peer.c
@@ -58,13 +58,12 @@ static int __rxrpc_create_peer(struct rxrpc_transport *trans, __be32 addr,
        _enter("%p,%08x", trans, ntohl(addr));
 
        /* allocate and initialise a peer record */
-       peer = kmalloc(sizeof(struct rxrpc_peer), GFP_KERNEL);
+       peer = kzalloc(sizeof(struct rxrpc_peer), GFP_KERNEL);
        if (!peer) {
                _leave(" = -ENOMEM");
                return -ENOMEM;
        }
 
-       memset(peer, 0, sizeof(struct rxrpc_peer));
        atomic_set(&peer->usage, 1);
 
        INIT_LIST_HEAD(&peer->link);