| Revision | 451771c40c6a0c44b57d4fbae8d6803e2213fa53 (tree) |
|---|---|
| Zeit | 2005-07-07 15:58:59 |
| Autor | Marcelo Tosatti <marcelo@dmt....> |
| Commiter | Marcelo Tosatti |
Revert [NETLINK]: Fix two socket hashing bugs.
I premutarely applied this fix - its not complete yet.
Revert.
net/netlink/af_netlink.c (diff)| @@ -330,9 +330,9 @@ static void netlink_remove(struct sock *sk) | ||
| 330 | 330 | u32 pid = nlk_sk(sk)->pid; |
| 331 | 331 | |
| 332 | 332 | netlink_table_grab(); |
| 333 | + hash->entries--; | |
| 333 | 334 | for (skp = nl_pid_hashfn(hash, pid); *skp; skp = &((*skp)->next)) { |
| 334 | 335 | if (*skp == sk) { |
| 335 | - hash->entries--; | |
| 336 | 336 | *skp = sk->next; |
| 337 | 337 | __sock_put(sk); |
| 338 | 338 | break; |
| @@ -450,7 +450,7 @@ retry: | ||
| 450 | 450 | err = netlink_insert(sk, pid); |
| 451 | 451 | if (err == -EADDRINUSE) |
| 452 | 452 | goto retry; |
| 453 | - return err; | |
| 453 | + return 0; | |
| 454 | 454 | } |
| 455 | 455 | |
| 456 | 456 | static inline int netlink_capable(struct socket *sock, unsigned int flag) |
Linux Kernel Documents
Fork