tree a50c7d3c9e8f8787217e06f56571d39f8b18f313
parent cbff79e43c1a47953098fdf3168dbc8320eba515
author Marcelo Tosatti <[EMAIL PROTECTED]> Thu, 07 Jul 2005 09:58:59 -0300
committer Marcelo Tosatti <[EMAIL PROTECTED]> Thu, 07 Jul 2005 09:58:59 -0300

Revert [NETLINK]: Fix two socket hashing bugs.

I premutarely applied this fix - its not complete yet.

Revert.

 net/netlink/af_netlink.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
@@ -330,9 +330,9 @@ static void netlink_remove(struct sock *
        u32 pid = nlk_sk(sk)->pid;
 
        netlink_table_grab();
+       hash->entries--;
        for (skp = nl_pid_hashfn(hash, pid); *skp; skp = &((*skp)->next)) {
                if (*skp == sk) {
-                       hash->entries--;
                        *skp = sk->next;
                        __sock_put(sk);
                        break;
@@ -450,7 +450,7 @@ retry:
        err = netlink_insert(sk, pid);
        if (err == -EADDRINUSE)
                goto retry;
-       return err;
+       return 0;
 }
 
 static inline int netlink_capable(struct socket *sock, unsigned int flag) 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-24" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to