diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 22:06:10 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-18 22:06:10 +0000 |
| commit | aba4e552a2f2c1492441acbccedd8e0a4c53f916 (patch) | |
| tree | 23921efb2b4af590160f034a89ff3da2ecca6e47 /net/ipv6 | |
| parent | 9e17e1aa1cf1cb497d2f67147a51831888affcf3 (diff) | |
Merge with Linux 2.3.43.
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/ipv6_sockglue.c | 3 | ||||
| -rw-r--r-- | net/ipv6/tcp_ipv6.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c index 873d22c3d..9f13435fa 100644 --- a/net/ipv6/ipv6_sockglue.c +++ b/net/ipv6/ipv6_sockglue.c @@ -7,7 +7,7 @@ * * Based on linux/net/ipv4/ip_sockglue.c * - * $Id: ipv6_sockglue.c,v 1.31 2000/01/16 05:11:38 davem Exp $ + * $Id: ipv6_sockglue.c,v 1.32 2000/01/31 01:21:25 davem Exp $ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -183,6 +183,7 @@ int ipv6_setsockopt(struct sock *sk, int level, int optname, char *optval, local_bh_enable(); sk->prot = &udp_prot; sk->socket->ops = &inet_dgram_ops; + sk->family = PF_INET; } opt = xchg(&np->opt, NULL); if (opt) diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 420b81f4a..47dcf8ce0 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -5,7 +5,7 @@ * Authors: * Pedro Roque <roque@di.fc.ul.pt> * - * $Id: tcp_ipv6.c,v 1.118 2000/01/18 08:24:22 davem Exp $ + * $Id: tcp_ipv6.c,v 1.119 2000/01/31 01:21:26 davem Exp $ * * Based on: * linux/net/ipv4/tcp.c @@ -450,6 +450,7 @@ unique: *skp = sk; sk->pprev = skp; + sk->hashent = hash; sock_prot_inc_use(sk->prot); write_unlock_bh(&head->lock); |