diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-23 00:40:54 +0000 |
| commit | 529c593ece216e4aaffd36bd940cb94f1fa63129 (patch) | |
| tree | 78f1c0b805f5656aa7b0417a043c5346f700a2cf /net/ipv6 | |
| parent | 0bd079751d25808d1972baee5c4eaa1db2227257 (diff) | |
Merge with 2.3.43. I did ignore all modifications to the qlogicisp.c
driver due to the Origin A64 hacks.
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/af_inet6.c | 4 | ||||
| -rw-r--r-- | net/ipv6/mcast.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index a8d396ba3..06d620952 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c @@ -7,7 +7,7 @@ * * Adapted from linux/net/ipv4/af_inet.c * - * $Id: af_inet6.c,v 1.52 2000/01/18 08:24:21 davem Exp $ + * $Id: af_inet6.c,v 1.53 2000/02/04 21:04:08 davem Exp $ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -341,6 +341,8 @@ static int inet6_getname(struct socket *sock, struct sockaddr *uaddr, if (peer) { if (!sk->dport) return -ENOTCONN; + if (((1<<sk->state)&(TCPF_CLOSE|TCPF_SYN_SENT)) && peer == 1) + return -ENOTCONN; sin->sin6_port = sk->dport; memcpy(&sin->sin6_addr, &sk->net_pinfo.af_inet6.daddr, sizeof(struct in6_addr)); diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c index 412b0b5e6..053db0c72 100644 --- a/net/ipv6/mcast.c +++ b/net/ipv6/mcast.c @@ -5,7 +5,7 @@ * Authors: * Pedro Roque <roque@di.fc.ul.pt> * - * $Id: mcast.c,v 1.29 2000/01/18 08:24:21 davem Exp $ + * $Id: mcast.c,v 1.30 2000/02/08 21:27:23 davem Exp $ * * Based on linux/ipv4/igmp.c and linux/ipv4/ip_sockglue.c * @@ -346,8 +346,8 @@ int ipv6_chk_mcast_addr(struct net_device *dev, struct in6_addr *addr) } } read_unlock_bh(&idev->lock); + in6_dev_put(idev); } - in6_dev_put(idev); return 0; } |